From: Mario <zacjardine@y7mail.com>
Date: Fri, 23 Jan 2015 23:26:15 +0000 (+1100)
Subject: Merge remote-tracking branch 'origin/master' into cbrutail/mapmodels-glowyplants
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=40990cef674149f1380476252cb658ba31789a90;p=xonotic%2Fxonotic-maps.pk3dir.git

Merge remote-tracking branch 'origin/master' into cbrutail/mapmodels-glowyplants
---

40990cef674149f1380476252cb658ba31789a90