From: Michael Friedrich <michael.friedrich@gmail.com>
Date: Sat, 22 Sep 2012 13:07:43 +0000 (+0200)
Subject: Merge branch 'master' into compatido
X-Git-Tag: v0.0.1~80
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=454adc5a90483b1daf57952f387847bf962591a2;p=icinga2

Merge branch 'master' into compatido
---

454adc5a90483b1daf57952f387847bf962591a2