[GraphicsMagick/el6: 3/3] Merge branch 'master' into el6

[Rex Dieter]

commit a504913d9c7c96087f4f8cba18f5a3e4d16e7444
Merge: f971706 b2a83fc
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Thu Aug 28 07:53:32 2014 -0500

    Merge branch 'master' into el6

 GraphicsMagick-1.3.20-CVE-2014-1947.patch |    2 +-
 GraphicsMagick.spec                       |    8 +++++++-
 2 files changed, 8 insertions(+), 2 deletions(-)
---