Merge branch 'stable'

diff --combined ui-atom.c
index 9f049aea2c2abde2b18959ab63ac9709967b8873,881872c06d9bbc08b6ab3837612799b1fc2c56d7..5c854c77b700c823798797d8476c2fe7f46b9daf
--- 1/ui-atom.c
--- 2/ui-atom.c
+++ b/ui-atom.c
@@@ -24,7 -24,7 +24,7 @@@ void add_entry(struct commit *commit, c
        html_txt(info->subject);
        html("</title>\n");
        html("<updated>");
-       cgit_print_date(info->author_date, FMT_ATOMDATE, ctx.cfg.local_time);
+       cgit_print_date(info->author_date, FMT_ATOMDATE, 0);
        html("</updated>\n");
        html("<author>\n");
        if (info->author) {
@@@ -49,7 -49,7 +49,7 @@@
        }
        html("</author>\n");
        html("<published>");
-       cgit_print_date(info->author_date, FMT_ATOMDATE, ctx.cfg.local_time);
+       cgit_print_date(info->author_date, FMT_ATOMDATE, 0);
        html("</published>\n");
        if (host) {
                html("<link rel='alternate' type='text/html' href='");
@@@ -85,9 -85,7 +85,9 @@@ void cgit_print_atom(char *tip, char *p
        struct rev_info rev;
        int argc = 2;
  
 -      if (!tip)
 +      if (ctx.qry.show_all)
 +              argv[1] = "--all";
 +      else if (!tip)
                argv[1] = ctx.qry.head;
  
        if (path) {