From: Sebastian Harl <sh@tokkee.org>
Date: Tue, 7 Apr 2009 12:41:47 +0000 (+0200)
Subject: Merge branch 'upstream'
X-Git-Tag: debian/1.3.7-1~14
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=333ab21495916a8d1c4a2861ef3fe86763fde684;p=pkg-rrdtool.git

Merge branch 'upstream'
---

333ab21495916a8d1c4a2861ef3fe86763fde684