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

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

61226288843337dd2f14f21d75057a2bef457543