Merge "[Bug 40716] Fix SearchEngineTest etc with non-wikitext content."
authorAaron Schulz <aschulz@wikimedia.org>
Fri, 12 Oct 2012 17:43:11 +0000 (17:43 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Fri, 12 Oct 2012 17:43:11 +0000 (17:43 +0000)

Trivial merge