From: Sven Hoexter <sven@timegate.de>
Date: Mon, 6 Feb 2012 09:11:16 +0000 (+0100)
Subject: Merge commit 'upstream/1.1.5'
X-Git-Tag: debian/1.1.5-1~4
X-Git-Url: https://git.sven.stormbind.net/?a=commitdiff_plain;h=af20e230d9f12ab0effd62cb634016038aa12e9d;p=sven%2Fpflogsumm.git

Merge commit 'upstream/1.1.5'
---

af20e230d9f12ab0effd62cb634016038aa12e9d