[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 60f7f50f7532f02c773c0fa1fb73760b6abebd42
Merge: 2500b56c2da98fcd70cba118a9cf9e300de4e51c cbd3e9baca50db8b0196690b0014ba614f28b86e
Author: Simon McVittie <smcv at debian.org>
Date:   Sat Jul 30 22:27:05 2011 +0100

    Merge branch 'upstream' into debian-experimental


-- 
Quake 3 engine