Merge "(bug 40876) Icon for PSD (Adobe Photoshop) file types."
authorHashar <hashar@free.fr>
Fri, 19 Oct 2012 13:43:42 +0000 (13:43 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Fri, 19 Oct 2012 13:43:42 +0000 (13:43 +0000)

Trivial merge