Merge "Always return something nice in Language::translateBlockExpiry()"
authorNikerabbit <niklas.laxstrom@gmail.com>
Tue, 20 Nov 2012 17:22:23 +0000 (17:22 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Tue, 20 Nov 2012 17:22:23 +0000 (17:22 +0000)

Trivial merge