[felix-main] 02/04: Merge tag 'upstream/4.6.1'

[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 b4e0c42453eda1d3ea2d85ceadb946e37fe49750
Merge: 7a4662d d3dd709
Author: Markus Koschany <apo at gambaru.de>
Date:   Thu Mar 19 20:35:20 2015 +0100

    Merge tag 'upstream/4.6.1'
    
    Upstream version 4.6.1
    
    # gpg: Signature made Thu 19 Mar 2015 20:35:16 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      |  2 +-
 doc/changelog.txt |  8 ++++++++
 pom.xml           | 10 +++++-----
 3 files changed, 14 insertions(+), 6 deletions(-)

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