Merge "SearchEngine::userHighlightPrefs needs no user"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Sat, 21 Sep 2013 18:56:18 +0000 (18:56 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Sat, 21 Sep 2013 18:56:18 +0000 (18:56 +0000)

Trivial merge