From: Samual <samual@xonotic.org>
Date: Fri, 18 Mar 2011 22:00:14 +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~7
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=6308c3d21f76319f807539c554d8616b0810a5cf;p=xonotic%2Fxonotic-data.pk3dir.git

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

6308c3d21f76319f807539c554d8616b0810a5cf