From: Michael Friedrich <michael.friedrich@gmail.com>
Date: Sat, 15 Sep 2012 11:23:51 +0000 (+0200)
Subject: Merge branch 'master' into compatido
X-Git-Tag: v0.0.1~89
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=3db96f01ceabefa1cd6194f8b830f56e9f44cc03;p=icinga2

Merge branch 'master' into compatido
---

3db96f01ceabefa1cd6194f8b830f56e9f44cc03