Merge commit 'refs/top-bases/t/projlist-cache/caching' into t/projlist-cache/caching
commitb8e326ef73e29d26556fc19553b767c31b64aa8f
authorKyle J. McKay <mackyle@gmail.com>
Thu, 23 Apr 2015 05:55:02 +0000 (22 22:55 -0700)
committerKyle J. McKay <mackyle@gmail.com>
Thu, 23 Apr 2015 05:55:02 +0000 (22 22:55 -0700)
tree503e8d6923e3f0b397bfc6b7e99b123ff3cd9b9d
parent2271a3b121be4d13a183a429d350aee593b9286f
parent9b65609559e900c2602930707e5bfebce89f2cdd
Merge commit 'refs/top-bases/t/projlist-cache/caching' into t/projlist-cache/caching

# Conflicts:
# gitweb/gitweb.perl
gitweb/gitweb.perl