Merge branch 'full-log'

Conflicts:
	cgit.c
	cgit.h

diff --cc cgit.c
index e09c86eaae248ead1fbcca8ee51224b98ccf94af,db5d342ceb196a0ae8f50e1131d1f65f5b41f731..166fbc649607fcc1872eb61c6c0cd2b7e7c6de31
--- 1/cgit.c
--- 2/cgit.c
+++ b/cgit.c
@@@ -154,8 -154,8 +154,10 @@@ static void querystring_cb(const char *
                ctx.qry.name = xstrdup(value);
        } else if (!strcmp(name, "mimetype")) {
                ctx.qry.mimetype = xstrdup(value);
 +      } else if (!strcmp(name, "s")){
 +              ctx.qry.sort = xstrdup(value);
+       } else if (!strcmp(name, "showmsg")) {
+               ctx.qry.showmsg = atoi(value);
        }
  }
  

diff --cc cgit.h
index f1fbeca0be7f08dc70221cb2d7cac433df039901,aab898b03bdbff524059b17b2ebc136243fa605d..cb2f176f621f52d60489dd817d2776411360b3bf
--- 1/cgit.h
--- 2/cgit.h
+++ b/cgit.h
@@@ -122,7 -121,7 +122,8 @@@ struct cgit_query 
        char *url;
        int   ofs;
        int nohead;
 +      char *sort;
+       int showmsg;
  };
  
  struct cgit_config {

diff --cc ui-log.c
Simple merge

diff --cc ui-refs.c
Simple merge

diff --cc ui-repolist.c
Simple merge

diff --cc ui-shared.c
Simple merge