]> git.ipfire.org Git - thirdparty/rrdtool-1.x.git/commitdiff
Merge remote-tracking branch 'upstream/master'
authorMaksym Sobolyev <sobomax@sippysoft.com>
Fri, 26 Dec 2014 19:25:08 +0000 (11:25 -0800)
committerMaksym Sobolyev <sobomax@sippysoft.com>
Fri, 26 Dec 2014 19:25:08 +0000 (11:25 -0800)

Trivial merge