Merge "(bug 42226) failure in sites tests"
authorHashar <hashar@free.fr>
Fri, 7 Dec 2012 10:43:28 +0000 (10:43 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Fri, 7 Dec 2012 10:43:28 +0000 (10:43 +0000)

Trivial merge