Merge "Make showDiffPage() protected"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Tue, 17 Feb 2015 17:56:16 +0000 (17:56 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Tue, 17 Feb 2015 17:56:16 +0000 (17:56 +0000)
1  2 
includes/page/Article.php

Simple merge