[game-data-packager] 02/02: Merge remote-tracking branch 'origin/master'

[Simon McVittie]

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

smcv pushed a commit to branch master
in repository game-data-packager.

commit 4e832854a0abed557e2ec9ed556b07b2632a752f
Merge: 1fe4f54 9a96e99
Author: Simon McVittie <smcv at debian.org>
Date:   Tue Mar 14 11:36:00 2017 +0000

    Merge remote-tracking branch 'origin/master'

 Makefile               |    2 +
 data/xcom-ufo.yaml     | 1211 +++++++-----------------------------------------
 debian/changelog       |    2 +
 doc/adding_a_game.mdwn |    5 +-
 doc/tags.txt           |    4 +-
 tools/ppa.py           |   45 +-
 6 files changed, 222 insertions(+), 1047 deletions(-)


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