From: Michael Friedrich <michael.friedrich@gmail.com>
Date: Fri, 28 Sep 2012 11:15:33 +0000 (+0200)
Subject: Merge branch 'master' of git.icinga.org:icinga2
X-Git-Tag: v0.0.1~56
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=b48ff35348727f95252531f185fc267ca7642f47;p=icinga2

Merge branch 'master' of git.icinga.org:icinga2
---

b48ff35348727f95252531f185fc267ca7642f47