Merge "Add a file icon for xcf file type"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Fri, 4 Jul 2014 10:58:39 +0000 (10:58 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Fri, 4 Jul 2014 10:58:39 +0000 (10:58 +0000)

Trivial merge