[ioquake3] 02/02: Merge branch 'debian/stretch' into debian/master

[Simon McVittie]

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

smcv pushed a commit to branch debian/master
in repository ioquake3.

commit 0ded749d5d161acc2e0ea0cac533dd675051fddd
Merge: 88c4ce4 920652a
Author: Simon McVittie <smcv at debian.org>
Date:   Tue Mar 14 22:38:49 2017 +0000

    Merge branch 'debian/stretch' into debian/master

 debian/changelog | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --cc debian/changelog
index 9367ce5,1c64d99..fe6d879
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,8 +1,10 @@@
 -ioquake3 (1.36+u20161101+dfsg1-3) UNRELEASED; urgency=medium
 +ioquake3 (1.36+u20170227+dfsg1-1) UNRELEASED; urgency=medium
  
 +  * debian/apparmor.d: allow more forms of device enumeration
 +  * New upstream snapshot
+   * Reference CVE-2017-6903 in previous changelog entry
  
 - -- Simon McVittie <smcv at debian.org>  Tue, 14 Mar 2017 22:38:25 +0000
 + -- Simon McVittie <smcv at debian.org>  Sat, 21 Jan 2017 20:17:57 +0000
  
  ioquake3 (1.36+u20161101+dfsg1-2) unstable; urgency=high
  

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