From: Hannes Eichblatt <hannes.eichblatt@publicispixelpark.de>
Date: Fri, 16 Jun 2017 12:14:01 +0000 (+0200)
Subject: Merge branch 'master' into 'master'
X-Git-Tag: v0.1.0~2801^2~29^2~8^2
X-Git-Url: https://git.uhu-banane.de/?a=commitdiff_plain;h=d33c714f75fabf5aedacd4833a818d90143763bc;p=pixelpark%2Fhiera.git

Merge branch 'master' into 'master'

cert_servername auskommentiert

See merge request !185
---

d33c714f75fabf5aedacd4833a818d90143763bc