From: Gunnar Beutner <gunnar.beutner@netways.de>
Date: Thu, 23 Aug 2012 07:38:47 +0000 (+0200)
Subject: Merge branch 'master' of github.com:gunnarbeutner/strawberry
X-Git-Tag: v0.0.1~124
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=ab1cfe24153937960a5b11c5f4710373dddb0fa0;p=icinga2

Merge branch 'master' of github.com:gunnarbeutner/strawberry
---

ab1cfe24153937960a5b11c5f4710373dddb0fa0