From: Sahil Singhal <sahil@sahil-desktop.(none)>
Date: Sat, 5 Jun 2010 18:48:48 +0000 (-0400)
Subject: Merge commit 'origin/master' into diabolik/erebusnyxplayermodel
X-Git-Tag: xonotic-v0.1.0preview~553
X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=commitdiff_plain;h=ab64e2bfe41e89a636dcf4d9fff33da9c2e251a9

Merge commit 'origin/master' into diabolik/erebusnyxplayermodel
---

ab64e2bfe41e89a636dcf4d9fff33da9c2e251a9