From: Tobias Oetiker <tobi@oetiker.ch>
Date: Sat, 18 Jul 2015 13:01:03 +0000 (+0200)
Subject: Merge branch '1.5' of github.com:oetiker/rrdtool-1.x into 1.5
X-Git-Tag: v1.5.4~26
X-Git-Url: http://git.ipfire.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=a35ade6041088593060328daab19e4645a2e1795;p=thirdparty%2Frrdtool-1.x.git

Merge branch '1.5' of github.com:oetiker/rrdtool-1.x into 1.5
---

a35ade6041088593060328daab19e4645a2e1795