[openarena-data] 02/02: Merge branch 'openarena-data' into openarena-oacmp1

[Simon McVittie]

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

smcv pushed a commit to branch openarena-oacmp1
in repository openarena-data.

commit 1a238d9d4efe1c0bd92703b0db1d5417d3189455
Merge: c2932ba 1834bc6
Author: Simon McVittie <smcv at debian.org>
Date:   Tue Jan 16 09:07:35 2018 +0000

    Merge branch 'openarena-data' into openarena-oacmp1

 debian/changelog | 1 +
 debian/watch     | 3 ---
 2 files changed, 1 insertion(+), 3 deletions(-)


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