Merge branch 'template'
authorFelix Dörre <felix@dogcraft.de>
Sat, 21 Jun 2014 14:45:33 +0000 (16:45 +0200)
committerFelix Dörre <felix@dogcraft.de>
Sat, 21 Jun 2014 14:45:33 +0000 (16:45 +0200)
commit7e979cc57595d265f750ac2076a34a3565b1197d
tree54669c3d416e995cb68544c48d49a55e344d9878
parentee35e5cb8bc089fe43517043f72d1d5f821970b7
parent630bdceea79451fdcd5cdd1084b34e7d205d657b
Merge branch 'template'