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

[Simon McVittie]

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

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

commit 7a00252c7f7d58a626b1cd55c9e5413f0f2a5eab
Merge: d3cbaea 1834bc6
Author: Simon McVittie <smcv at debian.org>
Date:   Tue Jan 16 09:06:26 2018 +0000

    Merge branch 'openarena-data' into openarena-maps

 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