From: Felix Dörre <felix@dogcraft.de>
Date: Thu, 10 Jul 2014 22:13:12 +0000 (+0200)
Subject: Merge branch 'templateHotDeploy' into newm
X-Git-Url: https://code.wpia.club/?p=gigi.git;a=commitdiff_plain;h=5778f9cb59077a91b5fd56da88d56f378f771b1b

Merge branch 'templateHotDeploy' into newm
---

5778f9cb59077a91b5fd56da88d56f378f771b1b