From: Cristy <urban-warrior@imagemagick.org>
Date: Sun, 18 Oct 2015 12:32:43 +0000 (-0400)
Subject: Merge branch 'master' of git.imagemagick.org:repos/ImageMagick
X-Git-Tag: 7.0.1-0~548
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=cc55e21f3952ee2dcd8f6cce89d398e4476bf202;p=imagemagick

Merge branch 'master' of git.imagemagick.org:repos/ImageMagick
---

cc55e21f3952ee2dcd8f6cce89d398e4476bf202