[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 f65aa1a173c24e603dc132a466fc284be4f41ce5
Merge: d435e33e9072722c92340883b5a8ee8a457864b8 eb77a4c8aa7157ada1a14908709e23373024c65a
Author: Simon McVittie <smcv at debian.org>
Date:   Mon Nov 28 21:20:41 2011 +0000

    Merge commit 'upstream/1.36+svn2202'


-- 
Quake 3 engine