Merge "(bug 37138) Fix broken Google sitesearch in DatabaseError"
authorDemon <chadh@wikimedia.org>
Wed, 6 Jun 2012 18:23:46 +0000 (18:23 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Wed, 6 Jun 2012 18:23:46 +0000 (18:23 +0000)

Trivial merge