[DRE-commits] [ruby-image-science] 02/07: Merge tag 'upstream/1.2.5'

[Gunnar Wolf]

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

gwolf pushed a commit to branch master
in repository ruby-image-science.

commit 48ee7537781399de42e396675569bc6c3a2f422a
Merge: f676e1f 46eeb2c
Author: Gunnar Wolf <gwolf at gwolf.org>
Date:   Tue Oct 1 11:47:35 2013 -0500

    Merge tag 'upstream/1.2.5'
    
    Upstream version 1.2.5
    
    # gpg: Signature made Tue 01 Oct 2013 11:47:31 AM CDT using RSA key ID C1DB921F
    # gpg: Good signature from "Gunnar Eyal Wolf Iszaevich <gwolf at debian.org>"
    # gpg:                 aka "Gunnar Eyal Wolf Iszaevich <gwolf at gwolf.org>"
    # gpg:                 aka "Gunnar Eyal Wolf Iszaevich (Instituto de Investigaciones Económicas UNAM) <gwolf at iiec.unam.mx>"

 History.txt                |   33 ++++++++++++++++++++++++-------
 Manifest.txt               |    1 +
 README.txt                 |    2 +-
 data.tar.gz.sig            |    4 +---
 lib/image_science.rb       |   46 +++++++++++++++++++++++++++-----------------
 metadata.gz.sig            |  Bin 256 -> 256 bytes
 metadata.yml               |   35 +++++++++++++++++----------------
 test/portrait.jpg          |  Bin 0 -> 6772 bytes
 test/test_image_science.rb |   43 +++++++++++++++++++++++++++++++++++------
 9 files changed, 112 insertions(+), 52 deletions(-)

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