[SCM] Quake 3 engine branch, master, updated. debian/1.36+svn2224-1-7-ga98017e

[Simon McVittie]

The following commit has been merged in the master branch:
commit 419f4c9c2a96299ae7847a71ac4c262fc9bce1a3
Author: Simon McVittie <smcv at debian.org>
Date:   Sat Mar 31 18:25:03 2012 +0100

    Merge from experimental

diff --git a/debian/changelog b/debian/changelog
index 07d89ee..321a0f1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,6 @@
 ioquake3 (1.36+svn2224-3) UNRELEASED; urgency=low
 
+  * Merge from experimental
   * Back out the patch that changes colour handling in the console:
     misleading for non-OpenArena, only minor impact for OpenArena
 

-- 
Quake 3 engine