Merge "mergeMessageFileList.php: abort on read error"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Fri, 5 Apr 2013 03:21:29 +0000 (03:21 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Fri, 5 Apr 2013 03:21:29 +0000 (03:21 +0000)

Trivial merge