From: Akari <hetors.email@gmail.com>
Date: Fri, 15 Apr 2011 08:12:28 +0000 (+0300)
Subject: Merge branch 'master' into akari/irc
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=649b809fcb96cf743aa6b455782b3567276e01f4;p=xonotic%2Fdarkplaces.git

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

649b809fcb96cf743aa6b455782b3567276e01f4