Merge "Unbreak cascading protection"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Tue, 9 Jul 2013 20:25:47 +0000 (20:25 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Tue, 9 Jul 2013 20:25:47 +0000 (20:25 +0000)
1  2 
includes/WikiPage.php

Simple merge