Merge branch 'lh/about'

Conflicts:
	cgit.h

diff --cc cgit.c
Simple merge

diff --cc cgit.h
index b8557ace3912b4b62c59eb709fc37dea2f1f506c,b8f485047e48d49f1c3fbdd0fe84a6aac6c6b355..4c854eaa8320771466460f18ff0839c73cc2dafc
--- 1/cgit.h
--- 2/cgit.h
+++ b/cgit.h
@@@ -187,7 -186,7 +188,8 @@@ struct cgit_config 
        int summary_branches;
        int summary_log;
        int summary_tags;
 +      struct string_list mimetypes;
+       struct cgit_filter *about_filter;
        struct cgit_filter *commit_filter;
        struct cgit_filter *source_filter;
  };

diff --cc cgitrc.5.txt
Simple merge