[game-data-packager] 02/02: 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 322a2ef4d15d3c296f2d2941ee37497b288f20d0
Merge: 4ac95a8 31ac802
Author: Alexandre Detiste <alexandre.detiste at gmail.com>
Date:   Mon Sep 21 11:03:47 2015 +0200

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

 debian/TODO                         |  1 -
 game_data_packager/__init__.py      | 37 +++++++++++++++++++++++++++++++------
 game_data_packager/make_template.py |  2 +-
 tools/fake_lgog.py                  |  3 ++-
 4 files changed, 34 insertions(+), 9 deletions(-)

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