[DRE-commits] [ruby-xmlparser] 02/03: Merge tag 'upstream/0.7.3'

[Lucas Nussbaum]

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

lucas pushed a commit to branch master
in repository ruby-xmlparser.

commit d1f2daf9f02c4037e9e172769b3407bb401d3d2f
Merge: 2bcb218 8645d0e
Author: Lucas Nussbaum <lucas at debian.org>
Date:   Wed May 6 22:25:20 2015 +0200

    Merge tag 'upstream/0.7.3'
    
    Upstream version 0.7.3
    
    Conflicts:
    	extconf.rb
    	xmlparser.c

 README      |    8 +-
 README.ja   |  922 ++++++++++++------------
 extconf.rb  |   59 ++
 xmlparser.c | 2292 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 4 files changed, 2823 insertions(+), 458 deletions(-)

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