Merge commit 'refs/top-bases/t/projlist-cache/caching' into t/projlist-cache/caching
commit70b7b663350e7575c1b12e336cc8fe70ec6e999e
authorKyle J. McKay <mackyle@gmail.com>
Mon, 27 Apr 2015 13:26:34 +0000 (27 06:26 -0700)
committerKyle J. McKay <mackyle@gmail.com>
Mon, 27 Apr 2015 13:26:34 +0000 (27 06:26 -0700)
treee85bc48a70e840b8af541be016a169bfa94f6eaa
parent1b1b8e766663400fb532ab3189fd8d58fc9b77a6
parent77373f55d09ab59d4313ae474aebc09805caf661
Merge commit 'refs/top-bases/t/projlist-cache/caching' into t/projlist-cache/caching

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