From: Sven Velt <sven@velt.de>
Date: Wed, 26 Jan 2011 11:07:40 +0000 (+0100)
Subject: Merge branch 'quilt'
X-Git-Tag: v_0_6_11-1~48
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=d32779a4822c8b6dfdd64b5f464918446db142a7;hp=--cc;p=pkg-pnp4nagios.git

Merge branch 'quilt'
---

d32779a4822c8b6dfdd64b5f464918446db142a7