From: nyov <nyov@nexnode.net>
Date: Fri, 16 Dec 2011 02:16:42 +0000 (+0100)
Subject: Merge branch 'master' into nyov/more-lineedit-fanciness
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=5a5aa9b0bcba9925eab3e4f5bc0cf2c8c1c37cd0;p=xonotic%2Fdarkplaces.git

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

5a5aa9b0bcba9925eab3e4f5bc0cf2c8c1c37cd0