Merge "Merge namespace aliases like we merge namespace names"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Thu, 17 Dec 2015 19:03:48 +0000 (19:03 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Thu, 17 Dec 2015 19:03:48 +0000 (19:03 +0000)
1  2 
includes/cache/LocalisationCache.php

Simple merge