[felix-main] 02/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 d0ab8d3b06830a09afe3552d87887247782e105d
Merge: cdeb7c7 18a553f
Author: Markus Koschany <apo at gambaru.de>
Date:   Mon May 4 13:34:50 2015 +0200

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

 DEPENDENCIES      |  2 +-
 doc/changelog.txt |  9 +++++++++
 pom.xml           | 14 +++++++-------
 3 files changed, 17 insertions(+), 8 deletions(-)

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