Merge branch 'master' into core-updates
gnu: imagemagick: Update to 6.8.6-9. * gnu/packages/imagemagick.scm (imagemagick): Update to 6.8.6-9.
Merge branch 'master' into core-updates Conflicts: gnu/packages/make-bootstrap.scm
gnu: Add ImageMagick. * gnu/packages/imagemagick.scm: New file. * Makefile.am (MODULES): Add it. * guix/download.scm (%mirrors): Add `imagemagick' entry.