From: gregor herrmann <gregoa@debian.org>
Date: Wed, 6 Jun 2012 23:04:04 +0000 (+0200)
Subject: Merge tag 'upstream/1.7'
X-Git-Tag: debian/1.7-1~4
X-Git-Url: https://git.toastfreeware.priv.at/debian/cpulimit.git/commitdiff_plain/2ecaf6a3da2b69a2e1a6a47650c228a986e75967

Merge tag 'upstream/1.7'

Upstream version 1.7
---

2ecaf6a3da2b69a2e1a6a47650c228a986e75967