Merge "For xcf files, compose layers before scaling"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Mon, 21 Jul 2014 12:29:59 +0000 (12:29 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Mon, 21 Jul 2014 12:29:59 +0000 (12:29 +0000)

Trivial merge