From: Sebastian Harl <sh@tokkee.org>
Date: Fri, 25 Jul 2008 09:21:54 +0000 (+0200)
Subject: Merge branch 'upstream'
X-Git-Tag: debian/1.3.1-2~5
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=300e5702fc070b5da9d8771684b010763c4db848;p=pkg-rrdtool.git

Merge branch 'upstream'
---

300e5702fc070b5da9d8771684b010763c4db848