[DRE-commits] [ruby-http-parser.rb] 02/07: Merge tag 'upstream/0.6.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-http-parser.rb.

commit be26d3030107ec6cf010e0c6a3470e2ad215bfaa
Merge: b0f8f0b dd0028f
Author: Praveen Arimbrathodiyil <praveen at debian.org>
Date:   Wed Apr 2 22:13:51 2014 +0530

    Merge tag 'upstream/0.6.0'
    
    Upstream version 0.6.0
    
    Conflicts:
    	http_parser.rb.gemspec

 README.md              | 2 +-
 http_parser.rb.gemspec | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

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