From: Sven Hoexter <sven@timegate.de>
Date: Wed, 1 Feb 2012 19:42:23 +0000 (+0100)
Subject: Merge commit 'upstream/1.1.4'
X-Git-Tag: debian/1.1.4-1~6
X-Git-Url: https://git.sven.stormbind.net/?a=commitdiff_plain;h=3137412731c34afbce14633f54a5b395d20d4af2;p=sven%2Fpflogsumm.git

Merge commit 'upstream/1.1.4'
---

3137412731c34afbce14633f54a5b395d20d4af2