[quake3/f14: 2/2] Merge branch 'master' into f14

[Dan Horák]

commit 8523a1b32aafbc24fc506a0d77375e00f7bb43d7
Merge: 914ab53 9321f90
Author: Dan Horák <dan at danny.cz>
Date:   Tue Aug 9 09:35:15 2011 +0200

    Merge branch 'master' into f14

 quake3-1.36-build.patch |   26 ++++++++++++++++++++++++++
 quake3.spec             |    8 +++++++-
 2 files changed, 33 insertions(+), 1 deletions(-)
---