From: Akari <hetors.email@gmail.com>
Date: Sun, 1 May 2011 09:17:12 +0000 (+0300)
Subject: Merge branch 'master' into akari/irc
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=7a78585b9e14936dfa3d3b7b2a906ffac23bb2e5;p=xonotic%2Fdarkplaces.git

Merge branch 'master' into akari/irc
---

7a78585b9e14936dfa3d3b7b2a906ffac23bb2e5