Merge branch 'lh/cache'

* lh/cache:
  Add page 'ls_cache'
  Redesign the caching layer

diff --cc cgit.c
Simple merge

diff --cc cgit.h
index daebeff704f4df080b1a8085c0b8b0adebab826c,f04d227979da58990126accba39003eaa2779594..bbb404e1e277f80d358e46275e0f08d5aa37af06
--- 1/cgit.h
--- 2/cgit.h
+++ b/cgit.h
@@@ -132,10 -132,9 +132,11 @@@ struct cgit_config 
        char *repo_group;
        char *robots;
        char *root_title;
 +      char *root_desc;
 +      char *root_readme;
        char *script_name;
        char *virtual_root;
+       int cache_size;
        int cache_dynamic_ttl;
        int cache_max_create_time;
        int cache_repo_ttl;

diff --cc cmd.c
Simple merge