[game-data-packager] 03/03: Merge branch 'master' of git+ssh://scm.alioth.debian.org//git/pkg-games/game-data-packager

[Alexandre Detiste]

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

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

commit 3832e0cabec255a59ae16e979f015e6a6a266875
Merge: 4f4d4b9 e47ad4d
Author: Alexandre Detiste <alexandre.detiste at gmail.com>
Date:   Tue Sep 15 12:00:14 2015 +0200

    Merge branch 'master' of git+ssh://scm.alioth.debian.org//git/pkg-games/game-data-packager

 data/rott.yaml                 | 24 ++++++++++++------------
 game_data_packager/__init__.py |  7 +++++++
 2 files changed, 19 insertions(+), 12 deletions(-)


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