Merge /tmp/bundle
authorRudolf Polzer <divVerent@xonotic.org>
Thu, 27 Jan 2011 16:06:10 +0000 (17:06 +0100)
committerRudolf Polzer <divVerent@xonotic.org>
Thu, 27 Jan 2011 16:06:10 +0000 (17:06 +0100)

Trivial merge