[DRE-commits] [ruby-http-parser.rb] 02/02: Merge branch 'upstream' of git+ssh://git.debian.org/git/pkg-ruby-extras/ruby-http-parser.rb

[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 b43025c7f1466e9c9c670c14bd3427eb229bc874
Merge: bc4b324 f42a37d
Author: Praveen Arimbrathodiyil <praveen at debian.org>
Date:   Wed Apr 2 23:21:22 2014 +0530

    Merge branch 'upstream' of git+ssh://git.debian.org/git/pkg-ruby-extras/ruby-http-parser.rb
    
    Conflicts:
    	http_parser.rb.gemspec


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