Merge commit 'ceb1f044b89ba79c6f5f431cd43ebcfa431486eb' (C.Brutail's launchpad fixes)
authorRudolf Polzer <divVerent@xonotic.org>
Tue, 16 Nov 2010 08:45:36 +0000 (09:45 +0100)
committerRudolf Polzer <divVerent@xonotic.org>
Tue, 16 Nov 2010 08:45:37 +0000 (09:45 +0100)

Trivial merge