From: Gunnar Beutner <gunnar@beutner.name>
Date: Sat, 26 May 2012 22:28:15 +0000 (+0200)
Subject: Merge branch 'master' of github.com:gunnarbeutner/strawberry
X-Git-Tag: v0.0.1~476
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=3fd4177ba0fcddce5d84ad752f9d900e55995978;p=icinga2

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

3fd4177ba0fcddce5d84ad752f9d900e55995978