From: Gunnar Beutner <gunnar.beutner@netways.de>
Date: Thu, 14 Jun 2012 13:17:51 +0000 (+0200)
Subject: Merge branch 'master' of github.com:gunnarbeutner/strawberry
X-Git-Tag: v0.0.1~429
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=e66285ddc535b870a45aa0102a29b2a4b6f71199;p=icinga2

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

Conflicts:
	components/checker/checkercomponent.cpp
---

e66285ddc535b870a45aa0102a29b2a4b6f71199