[libjide-oss-java] 01/03: Merge tag 'upstream/3.6.18+dfsg'

[Markus Koschany]

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

apo pushed a commit to branch master
in repository libjide-oss-java.

commit 05e001e760de00805095586c2b69b7e90a2a0c80
Merge: cb6f2cd c6580dd
Author: Markus Koschany <apo at debian.org>
Date:   Sun Jun 18 23:51:53 2017 +0200

    Merge tag 'upstream/3.6.18+dfsg'
    
    Upstream version 3.6.18+dfsg
    
    # gpg: Signatur vom So 18 Jun 2017 23:51:52 CEST
    # gpg:                mittels RSA-Schlüssel ACF3D088EF32EDEF6A1A835FD9AD14B9513B51E4
    # gpg: Korrekte Signatur von "Markus Koschany <apo at gambaru.de>" [ultimativ]
    # gpg:                     alias "Markus Koschany <markus at koschany.net>" [ultimativ]
    # gpg:                     alias "Markus Koschany <apo at debian.org>" [ultimativ]

 ChangeLog        | 4 ++++
 README.txt       | 2 +-
 build.properties | 2 +-
 pom.xml          | 2 +-
 4 files changed, 7 insertions(+), 3 deletions(-)

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