From: Sebastian Harl <sh@tokkee.org>
Date: Fri, 25 Apr 2014 18:05:59 +0000 (+0200)
Subject: Merged branch 'upstream'.
X-Git-Tag: debian/1.4.8-1~15
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=68281d5a62a954d68b3e856e9c527e7cedda4997;p=pkg-rrdtool.git

Merged branch 'upstream'.
---

68281d5a62a954d68b3e856e9c527e7cedda4997