[yquake2] 02/02: Merge branch 'upstream'

[Simon McVittie]

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

smcv pushed a commit to branch master
in repository yquake2.

commit 077ea72aadb7cf1698418e0095cf7741136cfa8e
Merge: 5d21324 90e5abd
Author: Simon McVittie <smcv at debian.org>
Date:   Thu Jun 30 11:58:49 2016 +0100

    Merge branch 'upstream'


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