Merge branch 'master' into next

diff --git a/cache.h b/cache.h
index 18d129f5bcb82940ff86640bd10f804fd86252ee..31755c85a0b90c16c87356c6e203576c7e7021a0 100644 (file)
--- a/cache.h
+++ b/cache.h
@@ -259,6 +259,7 @@ extern void *read_object_with_reference(const unsigned char *sha1,
                                        unsigned char *sha1_ret);
 
 const char *show_date(unsigned long time, int timezone);
+const char *show_rfc2822_date(unsigned long time, int timezone);
 int parse_date(const char *date, char *buf, int bufsize);
 void datestamp(char *buf, int bufsize);
 unsigned long approxidate(const char *);