Merge "SECURITY: Do not allow undeleting a revdel'd file if its top file"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Tue, 23 Aug 2016 03:05:53 +0000 (03:05 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Tue, 23 Aug 2016 03:05:53 +0000 (03:05 +0000)

Trivial merge