Merge branch 'ag/atom-fixes'

diff --cc cgit.c
Simple merge

diff --cc cgit.h
index 9b1e3f8ca7862857a0fa800dc6fda5becbe614c9,7fafb58aeb544be0e7d173d0240eedee9bcff67c..8884f9e500dddb7d403ed1877217d8f3600bb041
--- 1/cgit.h
--- 2/cgit.h
+++ b/cgit.h
@@@ -182,9 -182,9 +183,10 @@@ struct cgit_config 
        int enable_log_filecount;
        int enable_log_linecount;
        int enable_remote_branches;
 +      int enable_subject_links;
        int enable_tree_linenumbers;
        int local_time;
+       int max_atom_items;
        int max_repo_count;
        int max_commit_count;
        int max_lock_attempts;

diff --cc cgitrc.5.txt
Simple merge