[DRE-commits] [ruby-cutest] 01/05: Merge tag 'upstream/1.2.1'

[Praveen Arimbrathodiyil]

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

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

commit a8e882d5af213179e670523d9094c37e6f3ec2cb
Merge: d91a788 433e937
Author: Praveen Arimbrathodiyil <praveen at debian.org>
Date:   Thu Apr 3 17:33:25 2014 +0530

    Merge tag 'upstream/1.2.1'
    
    Upstream version 1.2.1
    
    Conflicts:
    	.gitignore

 .gitignore        |   2 +-
 CHANGELOG.md      |   9 +++++++++
 README.markdown   |  34 +++++++++++++++++++++-------------
 bin/cutest        |   4 +++-
 checksums.yaml.gz | Bin 0 -> 422 bytes
 cutest.gemspec    |  17 ++++++-----------
 lib/cutest.rb     |   8 +++++---
 metadata.yml      |  28 +++++++++++++++-------------
 test/run.rb       |  11 +++++++++++
 9 files changed, 71 insertions(+), 42 deletions(-)

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