[DRE-commits] [ruby-nokogiri] 01/03: Merge tag 'upstream/1.6.3.1+ds'

[Cédric Boutillier]

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

boutil pushed a commit to branch master
in repository ruby-nokogiri.

commit 743948415f2ff222d9ebe9bd63bdd3b6f54ca21a
Merge: 022de00 8585dbf
Author: Cédric Boutillier <boutil at debian.org>
Date:   Sat Jul 26 06:06:17 2014 +0200

    Merge tag 'upstream/1.6.3.1+ds'
    
    Upstream version 1.6.3.1+ds
    
    # gpg: Signature faite le sam. 26 juil. 2014 06:06:13 CEST avec la clef RSA d'identifiant 39CD217A
    # gpg: Bonne signature de « Cédric Boutillier <boutil at debian.org> »
    # gpg:                 alias « Cédric Boutillier <cedric.boutillier at upmc.fr> »
    # gpg:                 alias « Cédric Boutillier <cedric.boutillier at polytechnique.org> »
    # gpg:                 alias « Cédric Boutillier <cedric.boutillier at gmail.com> »

 .travis.yml                      |   3 +++
 CHANGELOG.ja.rdoc                |  23 ++++++++++++++++++++
 CHANGELOG.rdoc                   |  23 ++++++++++++++++++++
 build_all                        |   3 +--
 checksums.yaml.gz                | Bin 270 -> 267 bytes
 ext/nokogiri/extconf.rb          |   5 +++++
 ext/nokogiri/xml_document.c      |  31 ++++++++++++++++++++++----
 lib/nokogiri/version.rb          |   2 +-
 lib/nokogiri/xml/node.rb         |  18 +++++++++++----
 lib/nokogiri/xml/sax/document.rb |   2 +-
 metadata.yml                     |   4 ++--
 test/xml/test_document.rb        |   6 +++++
 test/xml/test_node.rb            |  46 +++++++++++++++++++++++++++++++++++++--
 test/xml/test_unparented_node.rb |   7 +++++-
 14 files changed, 156 insertions(+), 17 deletions(-)

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