Merge "Ehcache more like mehcache"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Thu, 16 Jan 2014 19:43:11 +0000 (19:43 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Thu, 16 Jan 2014 19:43:12 +0000 (19:43 +0000)

Trivial merge