Merge "Fix use of preg_match_all in MagicWord.php"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Fri, 18 Sep 2015 08:55:54 +0000 (08:55 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Fri, 18 Sep 2015 08:55:54 +0000 (08:55 +0000)

Trivial merge