[lgeneral-data] 10/12: Merge tag 'upstream/1.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 lgeneral-data.

commit 4e5ea9196e42c58a205e973638b4219345178daa
Merge: 1b22c35 ab55099
Author: Markus Koschany <apo at debian.org>
Date:   Thu Jan 14 19:47:50 2016 +0100

    Merge tag 'upstream/1.1'
    
    Upstream version 1.1
    
    # gpg: Signature made Thu 14 Jan 2016 19:47:43 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]
    # gpg:                 aka "Markus Koschany <apo at debian.org>" [ultimate]

 campaigns/kukgen | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

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