From: Maksym Sobolyev <sobomax@sippysoft.com>
Date: Mon, 22 Dec 2014 20:26:48 +0000 (-0800)
Subject: Merge remote-tracking branch 'upstream/master'
X-Git-Tag: v1.5.0-rc1~6^2~14
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=8cadf3eb0c1d61ec74a37106c2e657cb51e6eb71;p=thirdparty%2Frrdtool-1.x.git

Merge remote-tracking branch 'upstream/master'

Conflicts:
	src/rrd_graph_helper.c
---

8cadf3eb0c1d61ec74a37106c2e657cb51e6eb71