From: Gunnar Beutner <gunnar.beutner@netways.de>
Date: Fri, 13 Dec 2013 13:09:20 +0000 (+0100)
Subject: Merge branch 'feature/tp-contention-5327' into next
X-Git-Tag: v0.0.6~42
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=13d72c5ef57ded5e22382e2104842f6fa8c40d53;p=icinga2

Merge branch 'feature/tp-contention-5327' into next

Fixes #5327
---

13d72c5ef57ded5e22382e2104842f6fa8c40d53