[atomix] 03/03: Merge tag 'upstream/3.16.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 atomix.

commit a3928e4eecbb5cc92475da1272742f0218372117
Merge: 3387b14 a7626d7
Author: Markus Koschany <apo at gambaru.de>
Date:   Sun Apr 5 15:52:42 2015 +0200

    Merge tag 'upstream/3.16.0'
    
    Upstream version 3.16.0
    
    # gpg: Signature made Sun 05 Apr 2015 15:52:38 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]

 NEWS                       | 4 ++++
 configure.ac               | 4 ++--
 data/Makefile.am           | 2 ++
 data/atomix.appdata.xml.in | 2 +-
 data/ui/interface.ui       | 2 +-
 5 files changed, 10 insertions(+), 4 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/atomix.git