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

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

356ad6b4a86d7ed5c46beb61ef3d9d2eb5b5c6f4