Merge "(bug 25398) Remove upgrade1_5.php"
authorBrian Wolff <bawolff+wn@gmail.com>
Tue, 25 Dec 2012 22:35:43 +0000 (22:35 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Tue, 25 Dec 2012 22:35:43 +0000 (22:35 +0000)

Trivial merge