Merge "Restrict empty-frame cache entries to their parent"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Fri, 30 May 2014 01:43:02 +0000 (01:43 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Fri, 30 May 2014 01:43:02 +0000 (01:43 +0000)

Trivial merge