From: Sahil Singhal <sahil@sahil-desktop.(none)>
Date: Mon, 24 May 2010 21:08:37 +0000 (-0400)
Subject: Merge commit 'origin/master' into diabolik/pyriaplayermodel
X-Git-Tag: xonotic-v0.1.0preview~573^4
X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=commitdiff_plain;h=7478ee65e419e5cbd39978693820f451ad3c0754

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

7478ee65e419e5cbd39978693820f451ad3c0754