From: Samual <samual@xonotic.org>
Date: Sat, 19 Mar 2011 19:42:06 +0000 (-0400)
Subject: Merge remote branch 'origin/master' into samual/seeker_updates
X-Git-Tag: xonotic-v0.5.0~305^2~17^2~8^2~4
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=99653507155f95de069875bf9cc2c2ff5abd1561;p=xonotic%2Fxonotic-data.pk3dir.git

Merge remote branch 'origin/master' into samual/seeker_updates
---

99653507155f95de069875bf9cc2c2ff5abd1561