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

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

29d6afa1091efa147b33f983c2daf0b3d23872b1