[game-data-packager] 04/17: Merge remote-tracking branch 'a-detiste/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 9dcceb224f6638c4ffa8fed059506fbef1dd6de5
Merge: 8913293 1c5bb01
Author: Simon McVittie <smcv at debian.org>
Date:   Fri Jan 2 17:51:53 2015 +0000

    Merge remote-tracking branch 'a-detiste/master'

 data/rott-data.control.m4 |  15 +++++++
 data/rott-data.copyright  |  20 ++++++++++
 data/rott-data.yaml       | 100 ++++++++++++++++++++++++++++++++++++++++++++++
 debian/changelog          |   2 +-
 debian/control            |   1 +
 etc/alioth-mirrors        |   3 ++
 etc/rott-mirrors          |   1 +
 7 files changed, 141 insertions(+), 1 deletion(-)


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