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

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

c726adb5503bf1da2ae147a87ff1d718007cf040