]> WPIA git - gigi.git/commitdiff
Merge branch 'templateHotDeploy' into newm
authorFelix Dörre <felix@dogcraft.de>
Thu, 10 Jul 2014 22:13:12 +0000 (00:13 +0200)
committerFelix Dörre <felix@dogcraft.de>
Thu, 10 Jul 2014 22:35:16 +0000 (00:35 +0200)

Trivial merge