Merge remote branch 'origin/TickleMeElmo/UpdateServerMaps'
authorRudolf Polzer <divVerent@xonotic.org>
Mon, 20 Jun 2011 08:15:30 +0000 (10:15 +0200)
committerRudolf Polzer <divVerent@xonotic.org>
Mon, 20 Jun 2011 08:15:30 +0000 (10:15 +0200)

Trivial merge