Merge "(bug 46615) updateCollation.php: sanity check the collation before proceeding"
authorBrian Wolff <bawolff+wn@gmail.com>
Thu, 4 Apr 2013 01:15:46 +0000 (01:15 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Thu, 4 Apr 2013 01:15:46 +0000 (01:15 +0000)

Trivial merge