[SCM] Quake 3 engine branch, debian-experimental, updated. debian/1.36+svn1946-3-19-gf3cfa12

[Simon McVittie]

The following commit has been merged in the debian-experimental branch:
commit 46a83698539c5dfa88f60ec01f2bc231b7c6dffb
Merge: 60f7f50f7532f02c773c0fa1fb73760b6abebd42 8d9909ca74e79b3a4e136b077fb1138697421d68
Author: Simon McVittie <smcv at debian.org>
Date:   Mon Aug 1 22:07:53 2011 +0100

    Merge branch 'upstream' into debian-experimental


-- 
Quake 3 engine