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

Merge branch 'upstream'
---

bff4deea04a219797dd1d4a6179c704f2719da4b