From: Tobias Oetiker <tobi@oetiker.ch>
Date: Thu, 11 Jun 2015 21:46:26 +0000 (+0200)
Subject: Merge branch '1.5' of github.com:oetiker/rrdtool-1.x into 1.5
X-Git-Tag: v1.5.4~37
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=7601fd955bfc53b32494103ac6d9a2c04d5bed3a;p=thirdparty%2Frrdtool-1.x.git

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

7601fd955bfc53b32494103ac6d9a2c04d5bed3a