[jboss-modules] 02/06: Merge tag 'upstream/1.5.2'

[Markus Koschany]

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

apo pushed a commit to branch master
in repository jboss-modules.

commit cf2c153e7da894ca30256c1060c454bea6c3d2ef
Merge: ef548d1 e27d004
Author: Markus Koschany <apo at debian.org>
Date:   Fri Jun 24 19:59:02 2016 +0200

    Merge tag 'upstream/1.5.2'
    
    Upstream version 1.5.2
    
    # gpg: Signature made Fri 24 Jun 2016 19:58:58 CEST using RSA key ID 513B51E4
    # gpg: Good signature from "Markus Koschany <apo at gambaru.de>" [ultimate]
    # gpg:                 aka "Markus Koschany <markus at koschany.net>" [ultimate]
    # gpg:                 aka "Markus Koschany <apo at debian.org>" [ultimate]

 pom.xml                                            |  9 +++++-
 src/main/java/org/jboss/modules/Main.java          | 34 +++++++---------------
 src/main/java/org/jboss/modules/Module.java        |  1 +
 .../resources/org/jboss/modules/version.properties | 20 +++++++++++++
 4 files changed, 39 insertions(+), 25 deletions(-)

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