From: Michael Friedrich <michael.friedrich@gmail.com>
Date: Tue, 25 Sep 2012 09:07:17 +0000 (+0200)
Subject: Merge branch 'master' into mfriedrich/compatido
X-Git-Tag: v0.0.1~73
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=8886155fb0484db81bd34078733d7890d766a526;p=icinga2

Merge branch 'master' into mfriedrich/compatido
---

8886155fb0484db81bd34078733d7890d766a526