From: Tobias Oetiker <tobi@oetiker.ch>
Date: Mon, 10 Aug 2015 09:03:36 +0000 (+0200)
Subject: Merge branch '1.5' of github.com:oetiker/rrdtool-1.x into 1.5
X-Git-Tag: v1.6.0~25^2~24
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7248983be95c08edd07ab2f8d14caff11b752aa7;p=thirdparty%2Frrdtool-1.x.git

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

7248983be95c08edd07ab2f8d14caff11b752aa7