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

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

40b0cf814024584d0d111f5e8ce230e59c9f89af