From: nyov <nyov@nexnode.net>
Date: Sun, 5 Feb 2012 21:50:54 +0000 (+0100)
Subject: Merge branch 'master' into nyov/more-lineedit-fanciness
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=7957ab8de3b8237fef3879586819b37b52e5283d;p=xonotic%2Fdarkplaces.git

Merge branch 'master' into nyov/more-lineedit-fanciness
---

7957ab8de3b8237fef3879586819b37b52e5283d