From: Michael Friedrich <michael.friedrich@netways.de>
Date: Tue, 30 Aug 2016 13:16:40 +0000 (+0200)
Subject: Merge branch 'support/2.5'
X-Git-Tag: v2.6.0~152
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=69a20ced8559f984219b0526a24344d3b597d7e1;p=icinga2

Merge branch 'support/2.5'
---

69a20ced8559f984219b0526a24344d3b597d7e1