From: Sven Hoexter <sven@stormbind.net>
Date: Mon, 17 Jan 2011 15:35:01 +0000 (+0100)
Subject: Merge commit 'upstream/1.1.3'
X-Git-Tag: debian/1.1.3-2~15
X-Git-Url: https://git.sven.stormbind.net/?a=commitdiff_plain;h=e685345e7e418731ba7d75c149dd067f67c1a7d0;p=sven%2Fpflogsumm.git

Merge commit 'upstream/1.1.3'
---

e685345e7e418731ba7d75c149dd067f67c1a7d0