Merge branch 'divVerent/xact'
authorRudolf Polzer <divverent@xonotic.org>
Fri, 7 Oct 2011 12:06:58 +0000 (14:06 +0200)
committerRudolf Polzer <divverent@xonotic.org>
Fri, 7 Oct 2011 12:06:58 +0000 (14:06 +0200)

Trivial merge