[felix-main] 05/05: Merge tag 'upstream/5.0.0'

[Markus Koschany]

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

apo-guest pushed a commit to branch master
in repository felix-main.

commit a8ebe0c10b0813212a7297c706745c8981cfc820
Merge: 6a77745 bf5ba57
Author: Markus Koschany <apo at gambaru.de>
Date:   Mon May 4 14:05:31 2015 +0200

    Merge tag 'upstream/5.0.0'
    
    Upstream version 5.0.0
    
    # gpg: Signature made Mon 04 May 2015 14:05:28 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]


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