Merge "Moved $wgShowUpdatedMarker checks to the right place"
authorAaron Schulz <aschulz@wikimedia.org>
Wed, 15 Apr 2015 15:09:24 +0000 (15:09 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Wed, 15 Apr 2015 15:09:24 +0000 (15:09 +0000)

Trivial merge