From: nyov <nyov@nexnode.net>
Date: Mon, 12 Mar 2012 10:58:38 +0000 (+0100)
Subject: Merge branch 'master' into nyov/more-lineedit-fanciness
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=517054f1dafc14c5e3f8cfd540cad10a1435593d;p=xonotic%2Fdarkplaces.git

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

517054f1dafc14c5e3f8cfd540cad10a1435593d