Merge "Workaround image magick issue with greyscale xcf files"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Wed, 2 Jul 2014 13:58:28 +0000 (13:58 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Wed, 2 Jul 2014 13:58:28 +0000 (13:58 +0000)

Trivial merge