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

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

Conflicts:
	dyntest/dyntest.cpp
---

e7169fdf8ac405f8fa3f65e486d610f5b2d80e2f