From: nyov <nyov@nexnode.net>
Date: Sat, 28 Apr 2012 21:31:19 +0000 (+0200)
Subject: Merge branch 'master' into nyov/more-lineedit-fanciness
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=29e284b3b1cb06c7062c85467327e35a10cc5f2e;p=xonotic%2Fdarkplaces.git

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

29e284b3b1cb06c7062c85467327e35a10cc5f2e