[game-data-packager] 02/04: Merge branch 'master' of git://anonscm.debian.org/pkg-games/game-data-packager

[Markus Koschany]

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

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

commit a3eaed32b17c1a76fb3079096fddf36469ce9355
Merge: 69e1177 f2bdb4a
Author: Markus Koschany <apo at gambaru.de>
Date:   Mon Sep 28 05:18:59 2015 +0200

    Merge branch 'master' of git://anonscm.debian.org/pkg-games/game-data-packager

 data/discworld-1.yaml | 481 ++++++++++++++++++++++++++++++++++++++++++++++++++
 data/future-wars.yaml | 166 +++++++++++++++++
 data/wikipedia.csv    |  72 ++++++++
 debian/TODO           |   2 -
 debian/changelog      |   4 +
 debian/control        |   2 +
 tools/spider.py       |  59 +++++++
 7 files changed, 784 insertions(+), 2 deletions(-)

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