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

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

ea9309096c62c11d174a7b66c8937dd4724f5385