Merge branch 'wip/configurable-mime-type-gicon'
commit54f3c0a904245c7be41d4ed940ecba0250dc725f
authorColomban Wendling <ban@herbesfolles.org>
Mon, 14 Apr 2014 18:32:59 +0000 (14 20:32 +0200)
committerColomban Wendling <ban@herbesfolles.org>
Mon, 14 Apr 2014 18:32:59 +0000 (14 20:32 +0200)
treecb640906b705894965994c069b8e93accb8477f3
parent0b4ec549fc02d781a6213fad109f954dcaf28f40
parent1abee90434649c6f84f037021743cb11699f9555
Merge branch 'wip/configurable-mime-type-gicon'