Merge "Revert "Convert mediawiki.toc and mediawiki.user to using mw.cookie""
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Thu, 28 May 2015 00:54:49 +0000 (00:54 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Thu, 28 May 2015 00:54:49 +0000 (00:54 +0000)
1  2 
resources/Resources.php

Simple merge