[felix-main] 01/10: Merge tag 'upstream/4.6.0'

[Markus Koschany]

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

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

commit e9db62103b81b9609c77a89a980743320b5b86da
Merge: c22eec6 421a119
Author: Markus Koschany <apo at gambaru.de>
Date:   Fri Feb 6 15:11:10 2015 +0100

    Merge tag 'upstream/4.6.0'
    
    Upstream version 4.6.0
    
    # gpg: Signature made Fri 06 Feb 2015 15:11:06 CET 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                                  | 12 +++++++
 pom.xml                                            | 37 ++++++++++++++++------
 src/main/appended-resources/META-INF/DEPENDENCIES  |  4 +--
 src/main/appended-resources/META-INF/NOTICE        |  2 +-
 .../java/org/apache/felix/main/AutoProcessor.java  | 27 ++++++++++++----
 src/main/java/org/apache/felix/main/Main.java      |  2 +-
 8 files changed, 70 insertions(+), 24 deletions(-)

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