[nailgun] 02/03: Merge branch 'master' of git://git.debian.org/pkg-java/nailgun

[Hideki Yamane]

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

henrich pushed a commit to branch master
in repository nailgun.

commit 432acbc7192340fe3a46d4551637be685d496af4
Merge: 06610f7 34efd1c
Author: Hideki Yamane <henrich at debian.org>
Date:   Wed Apr 29 23:47:39 2015 +0900

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

 debian/changelog                                   | 23 +++++++--
 debian/control                                     | 17 +++++--
 debian/copyright                                   |  2 +-
 debian/nailgun.links                               |  1 -
 debian/nailgun.poms                                |  1 +
 debian/patches/adjust_maven_plugins_versions.patch | 56 ++++++++++++++++++++++
 debian/patches/remove_parent_from_main_pom.patch   | 20 ++++++++
 debian/patches/series                              |  2 +
 debian/rules                                       | 11 ++++-
 debian/watch                                       |  3 +-
 10 files changed, 124 insertions(+), 12 deletions(-)

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