[groovy2] 02/12: Merge branch 'master' of git://anonscm.debian.org/pkg-java/groovy2

[komal sukhani]

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

komal-guest pushed a commit to branch master
in repository groovy2.

commit ccc5a749259af713e8dc45d033a84611fa2e42bc
Merge: 5ff0e61 2f0df35
Author: komal <komaldsukhani at gmail.com>
Date:   Mon Jun 22 22:39:51 2015 +0530

    Merge branch 'master' of git://anonscm.debian.org/pkg-java/groovy2

 debian/changelog                                     | 10 +++++-----
 debian/control                                       |  1 -
 debian/patches/change_testng_dependency_version.diff |  2 +-
 debian/rules                                         |  2 +-
 4 files changed, 7 insertions(+), 8 deletions(-)

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