From: nyov <nyov@nexnode.net>
Date: Fri, 9 Mar 2012 06:55:47 +0000 (+0100)
Subject: Merge branch 'master' into nyov/more-lineedit-fanciness
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=097b2c81a3c6ccfc45e3377bea48aac6bf8308ed;p=xonotic%2Fdarkplaces.git

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

097b2c81a3c6ccfc45e3377bea48aac6bf8308ed