[jruby-joni] 01/02: Merge tag 'upstream/2.1.4'

[Hideki Yamane]

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

henrich pushed a commit to branch master
in repository jruby-joni.

commit e1f592aa962747b4489991043333af397a1557dd
Merge: d9fed72 ef805f2
Author: Hideki Yamane <henrich at debian.org>
Date:   Sat Oct 25 21:17:32 2014 +0900

    Merge tag 'upstream/2.1.4'
    
    Upstream version 2.1.4

 pom.xml                                |  2 +-
 src/org/joni/Parser.java               |  2 +-
 src/org/joni/constants/AnchorType.java | 10 ++++++++--
 3 files changed, 10 insertions(+), 4 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/jruby-joni.git