Merge "Revert "Do not encode "'" as %27 (redirect loop in Opera 12)""
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Thu, 10 Sep 2015 15:36:10 +0000 (15:36 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Thu, 10 Sep 2015 15:36:10 +0000 (15:36 +0000)
1  2 
includes/GlobalFunctions.php
resources/src/mediawiki/mediawiki.util.js
tests/parser/parserTests.txt
tests/qunit/suites/resources/mediawiki/mediawiki.jqueryMsg.test.js
tests/qunit/suites/resources/mediawiki/mediawiki.util.test.js

Simple merge
Simple merge