Fix https://gerrit.wikimedia.org/r/4830 , I botched the conflict
authorCatrope <roan.kattouw@gmail.com>
Fri, 13 Apr 2012 00:48:03 +0000 (17:48 -0700)
committerCatrope <roan.kattouw@gmail.com>
Fri, 13 Apr 2012 00:48:03 +0000 (17:48 -0700)
commite69afa4340372081eb558af5a8962ec3a0ea630c
tree58b43ca177def01368fb976350fa6c2aab7e7057
parentd242205f7293858ba49c6d682f253484c90ba52d
Fix https://gerrit.wikimedia.org/r/4830 , I botched the conflict
resolution there

Change-Id: I7d563851e8b89c249105e91ceed71f747732084f
maintenance/mergeMessageFileList.php