From: Gunnar Beutner <gunnar.beutner@netways.de>
Date: Tue, 9 Jul 2013 06:46:02 +0000 (+0200)
Subject: Merge remote-tracking branch 'origin/master'
X-Git-Tag: v0.0.3~877
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=0f565130873b49023137cc3ede67e21fd3beb546;p=icinga2

Merge remote-tracking branch 'origin/master'
---

0f565130873b49023137cc3ede67e21fd3beb546