From: PlasmaSheep <plasmasheep@gmail.com>
Date: Fri, 22 Jul 2011 00:58:28 +0000 (-0700)
Subject: Merge branch 'master' into plasmasheep/lsp
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=dcbf4c1f79af87de0090fc2f010ed8541fb8d099;p=xonotic%2Fxonotic-maps.pk3dir.git

Merge branch 'master' into plasmasheep/lsp
---

dcbf4c1f79af87de0090fc2f010ed8541fb8d099