[SCM] Quake 3 engine branch, master, updated. debian/1.36+svn2131-1-15-gf65aa1a

[Simon McVittie]

The following commit has been merged in the master branch:
commit cd356a0e6ee0f91533903aacf7f3f9ae35270c9b
Merge: fdd9f457f8e640e24ac35e89559050e48a9ba3a5 aead105abb88a6813397b559e930d7407fac6f39
Author: Simon McVittie <smcv at debian.org>
Date:   Mon Nov 28 20:46:43 2011 +0000

    Merge commit 'upstream/1.36+svn2202'


-- 
Quake 3 engine