From: Gunnar Beutner <gunnar.beutner@netways.de>
Date: Tue, 15 May 2012 09:08:33 +0000 (+0200)
Subject: Merge branch 'master' of github.com:gunnarbeutner/strawberry
X-Git-Tag: v0.0.1~518
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=2f6380c8f1d7fce977814bba6c3397d116effdf1;p=icinga2

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

2f6380c8f1d7fce977814bba6c3397d116effdf1