[DRE-commits] [ruby-mini-magick] 02/03: Merge tag 'upstream/4.2.3'

[Cédric Boutillier]

This is an automated email from the git hooks/post-receive script.

boutil pushed a commit to branch master
in repository ruby-mini-magick.

commit 98bd93bfab7d5cd7c837fa57cb6afc1796785410
Merge: 3b9e60e db931dc
Author: Cédric Boutillier <boutil at debian.org>
Date:   Wed Apr 29 23:21:41 2015 +0200

    Merge tag 'upstream/4.2.3'
    
    Upstream version 4.2.3
    
    # gpg: Signature faite le mer. 29 avril 2015 23:21:36 CEST avec la clef RSA d'identifiant 39CD217A
    # gpg: Bonne signature de « Cédric Boutillier <boutil at debian.org> »
    # gpg:                 alias « Cédric Boutillier <cedric.boutillier at upmc.fr> »
    # gpg:                 alias « Cédric Boutillier <cedric.boutillier at polytechnique.org> »
    # gpg:                 alias « Cédric Boutillier <cedric.boutillier at gmail.com> »

 lib/mini_magick/configuration.rb   |   2 --
 lib/mini_magick/image.rb           |   6 +++---
 lib/mini_magick/image/info.rb      |  21 ++++++++++-----------
 lib/mini_magick/tool.rb            |   4 ----
 lib/mini_magick/version.rb         |   2 +-
 spec/fixtures/image.psd            | Bin 363212 -> 0 bytes
 spec/lib/mini_magick/image_spec.rb |   4 ++--
 spec/support/helpers.rb            |   2 --
 8 files changed, 16 insertions(+), 25 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ruby-extras/ruby-mini-magick.git