Merge "Removed $wgPageShowWatchingUsers"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Thu, 2 Oct 2014 21:12:46 +0000 (21:12 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Thu, 2 Oct 2014 21:12:46 +0000 (21:12 +0000)
1  2 
RELEASE-NOTES-1.25
includes/DefaultSettings.php

Simple merge
Simple merge