[game-data-packager] 11/13: 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 4ace9f672948671b9e3362815193462096285e23
Merge: 6449773 f233879
Author: Simon McVittie <smcv at debian.org>
Date:   Sat Jan 17 01:08:28 2015 +0000

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

 Makefile                    | 20 ++++++++++++++++++--
 data/hexen2-data.control.in |  1 +
 data/quake3-data.control.in |  1 +
 debian/control              |  5 ++---
 4 files changed, 22 insertions(+), 5 deletions(-)

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