From: Michael Friedrich <michael.friedrich@gmail.com>
Date: Fri, 28 Sep 2012 10:15:23 +0000 (+0200)
Subject: Merge branch 'mfriedrich/compatido'
X-Git-Tag: v0.0.1~59
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=71cbfe8fea20c517816c8ff953024bd85c2bf183;p=icinga2

Merge branch 'mfriedrich/compatido'
---

71cbfe8fea20c517816c8ff953024bd85c2bf183