From: Tobias Oetiker <tobi@oetiker.ch>
Date: Tue, 28 Jul 2015 15:39:04 +0000 (+0200)
Subject: Merge branch '1.5' of github.com:oetiker/rrdtool-1.x into 1.5
X-Git-Tag: v1.5.4~15
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=21b3955d273a36e01745358d5b5f44415c1d3ff6;p=thirdparty%2Frrdtool-1.x.git

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

21b3955d273a36e01745358d5b5f44415c1d3ff6