[SCM] Quake 3 engine branch, master, updated. f9474eeba468251086e341ca4362614664280427

[Simon McVittie]

The following commit has been merged in the master branch:
commit 36812934599e2f5faad6259b07ab1d5b0e8e27c8
Merge: 982d153d339e43af5a40afac63c2f614b01e47b1 bad6e706db2913583ef87588a52873915c2cc494
Author: Simon McVittie <smcv at debian.org>
Date:   Sat Aug 14 00:22:52 2010 +0100

    Merge commit 'upstream/1.36+svn1788j'


-- 
Quake 3 engine