From: Tobias Oetiker <tobi@oetiker.ch>
Date: Tue, 10 Nov 2015 15:08:24 +0000 (+0100)
Subject: Merge branch '1.5' of github.com:oetiker/rrdtool-1.x
X-Git-Tag: v1.6.0~25
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=50ed3673bbfdc54c371111517f878f0daa6947b4;p=thirdparty%2Frrdtool-1.x.git

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

Conflicts:
	README.md
---

50ed3673bbfdc54c371111517f878f0daa6947b4