Merge branch 'jd/gitolite'

diff --combined cgit.h
index 32d9d2b026550046b8b0dd8dea60cf45d38fb267,232099dba6bf759c28e62dccac46faf2288d0fe0..4090cd4f2fe114d6a70f9d138d9b67b3ad861d39
--- 1/cgit.h
--- 2/cgit.h
+++ b/cgit.h
@@@ -19,7 -19,6 +19,7 @@@
  #include <xdiff-interface.h>
  #include <xdiff/xdiff.h>
  #include <utf8.h>
 +#include <notes.h>
  
  
  /*
@@@ -167,6 -166,7 +167,7 @@@ struct cgit_config 
        char *logo;
        char *logo_link;
        char *module_link;
+       char *project_list;
        char *robots;
        char *root_title;
        char *root_desc;
@@@ -183,6 -183,7 +184,7 @@@
        int cache_static_ttl;
        int embedded;
        int enable_filter_overrides;
+       int enable_gitweb_owner;
        int enable_index_links;
        int enable_log_filecount;
        int enable_log_linecount;
@@@ -202,6 -203,7 +204,7 @@@
        int noplainemail;
        int noheader;
        int renamelimit;
+       int remove_suffix;
        int snapshots;
        int summary_branches;
        int summary_log;