From: Peter Stamfest Date: Tue, 4 Mar 2014 21:52:27 +0000 (+0100) Subject: Merge branch 'master' of https://github.com/oetiker/rrdtool-1.x into rrdmodify-master X-Git-Tag: v1.5.0-rc1~131^2 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F449%2Fhead;p=thirdparty%2Frrdtool-1.x.git Merge branch 'master' of https://github.com/oetiker/rrdtool-1.x into rrdmodify-master --- ac7ffda9e7667673a68e8dd0a79f95a4a1d9ed97