[felix-main] 02/08: Merge tag 'upstream/4.4.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 76552c35b4a641faba63dee82028e66554fb8f66
Merge: 2322c0b c852352
Author: Markus Koschany <apo at gambaru.de>
Date:   Sat Jul 12 21:17:53 2014 +0200

    Merge tag 'upstream/4.4.0'
    
    Upstream version 4.4.0
    
    # gpg: Signature made Sat 12 Jul 2014 21:17:40 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                                      |  6 ++---
 NOTICE                                            |  4 +--
 doc/changelog.txt                                 | 30 +++++++++++++++++++++++
 pom.xml                                           | 21 +++++++++++-----
 src/main/appended-resources/META-INF/DEPENDENCIES |  4 +--
 src/main/appended-resources/META-INF/NOTICE       |  2 +-
 src/main/java/org/apache/felix/main/Main.java     | 24 +++++++++---------
 7 files changed, 66 insertions(+), 25 deletions(-)

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