[DRE-commits] [ruby-mini-magick] 01/03: Merge tag 'upstream/4.2.0'

[Praveen Arimbrathodiyil]

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

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

commit fab3c5d93aef8c117c12072d8f7d99aef581de10
Merge: 8d8727a d06f20b
Author: Praveen Arimbrathodiyil <praveen at debian.org>
Date:   Fri Apr 3 22:43:39 2015 +0530

    Merge tag 'upstream/4.2.0'
    
    Upstream version 4.2.0
    
    # gpg: Signature made Friday 03 April 2015 10:43:33 PM IST using RSA key ID 4512C22A
    # gpg: Good signature from "Praveen Arimbrathodiyil (piratepin) <praveen at debian.org>"
    # gpg:                 aka "Pirate Praveen (pirates.org.in) <praveen at onenetbeyond.org>"
    # gpg:                 aka "Pirate Praveen (piratesin) <me at j4v4m4n.in>"

 .travis.yml                                |  12 ++-
 README.md                                  | 159 +++++++++++++++++++++++++----
 lib/mini_gmagick.rb                        |   2 +-
 lib/mini_magick/configuration.rb           |  22 ++++
 lib/mini_magick/image.rb                   |  15 ++-
 lib/mini_magick/image/info.rb              |  49 ++++++---
 lib/mini_magick/shell.rb                   |  21 +++-
 lib/mini_magick/tool.rb                    |  43 ++++++--
 lib/mini_magick/version.rb                 |   4 +-
 mini_magick.gemspec                        |   5 +-
 spec/fixtures/with:colon.jpg               | Bin 0 -> 26295 bytes
 spec/lib/mini_magick/configuration_spec.rb |   4 +-
 spec/lib/mini_magick/image_spec.rb         |  30 +++++-
 spec/lib/mini_magick/shell_spec.rb         |  46 ++++++---
 spec/lib/mini_magick/tool_spec.rb          |  10 ++
 spec/spec_helper.rb                        |  13 ++-
 spec/support/helpers.rb                    |   1 +
 17 files changed, 353 insertions(+), 83 deletions(-)

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