From: Gunnar Beutner <gunnar@beutner.name>
Date: Sun, 17 Jun 2012 23:44:10 +0000 (+0200)
Subject: Merge branch 'master' of github.com:gunnarbeutner/strawberry
X-Git-Tag: v0.0.1~406
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=f41032e69b57e6caa22d644acca1c25f7cc6d13c;p=icinga2

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

f41032e69b57e6caa22d644acca1c25f7cc6d13c