[jruby-joni] 51/194: Merge branch 'master' of https://github.com/jruby/joni

[Hideki Yamane]

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

henrich pushed a commit to branch debian/sid
in repository jruby-joni.

commit 42d1661e9d2f1278b24cd9de665af972c720d3cd
Merge: 218f41c f09a33c
Author: Marcin Mielzynski <lopx at gazeta.pl>
Date:   Fri Dec 29 22:42:38 2017 +0100

    Merge branch 'master' of https://github.com/jruby/joni

 LICENSE                  | 21 +++++++++++++++++++++
 README.md                |  3 +++
 build.xml                |  5 -----
 src/org/joni/Config.java |  2 +-
 src/org/joni/Syntax.java |  1 +
 5 files changed, 26 insertions(+), 6 deletions(-)

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