Merge branch 'maint' into ht/namespaces
commit93bc7d55cc7980f12356cacdb63aeb942f7a7243
authorHenrik Tidefelt <tiddeweb@gmail.com>
Wed, 8 Oct 2014 20:41:50 +0000 (8 22:41 +0200)
committerHenrik Tidefelt <tiddeweb@gmail.com>
Thu, 9 Oct 2014 19:08:08 +0000 (9 21:08 +0200)
treef609bb0ce153e618ddb1a52c41d428e26d36f658
parent6234b8caad7c349179dddaffe37304fd51864101
parentd747ca7bfb141538029e9eb6c6bb7be806487fb1
Merge branch 'maint' into ht/namespaces

* maint:
  Adapt to recent changes in ImageMagick's 'identify'