From: Akari <hetors.email@gmail.com>
Date: Tue, 26 Apr 2011 07:59:31 +0000 (+0300)
Subject: Merge branch 'master' into akari/irc
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=f3932067b589ee5a77516a936a1476a87e661906;p=xonotic%2Fdarkplaces.git

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

f3932067b589ee5a77516a936a1476a87e661906