From: Thomas Heller <thomas.heller@publicispixelpark.de>
Date: Mon, 24 Oct 2016 11:48:16 +0000 (+0200)
Subject: Merge branch 'patch-11' into 'master'
X-Git-Tag: v0.1.0~3921
X-Git-Url: https://git.uhu-banane.de/?a=commitdiff_plain;h=253a7ce34332ad347652cd59517331d48efbf8b3;p=pixelpark%2Fhiera.git

Merge branch 'patch-11' into 'master'

Added Christof as to Dev.



See merge request !80
---

253a7ce34332ad347652cd59517331d48efbf8b3