From: Gunnar Beutner <gunnar.beutner@netways.de>
Date: Thu, 29 Aug 2013 11:49:28 +0000 (+0200)
Subject: Merge remote-tracking branch 'origin/master'
X-Git-Tag: v0.0.3~660
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=cef1a6856aab8a115ee03a0f492f05d0cd6180cf;p=icinga2

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

cef1a6856aab8a115ee03a0f492f05d0cd6180cf