Merge "Clarify that $terms get preg_quoted by caller in SearchHighlighter"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Wed, 7 Sep 2016 14:18:43 +0000 (14:18 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Wed, 7 Sep 2016 14:18:43 +0000 (14:18 +0000)

Trivial merge