Merge "Allow SearchResults to specify that they matched file content"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Fri, 17 Jan 2014 19:33:24 +0000 (19:33 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Fri, 17 Jan 2014 19:33:24 +0000 (19:33 +0000)

Trivial merge