Merge "Fix for Ia9baaf0b: Make previously public variables public again"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Fri, 12 Sep 2014 19:52:51 +0000 (19:52 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Fri, 12 Sep 2014 19:52:51 +0000 (19:52 +0000)
1  2 
includes/EditPage.php
includes/page/Article.php

Simple merge
Simple merge