Merge branch 'master' into ff/rrdd
authorFlorian Forster <octo@verplant.org>
Tue, 2 Sep 2008 09:36:35 +0000 (11:36 +0200)
committerFlorian Forster <octo@verplant.org>
Tue, 2 Sep 2008 09:36:35 +0000 (11:36 +0200)
commit210e991460e82d01d086f853e65485040eb2fffb
treeb4a29b5afdda3599897304479fff9592fc5f9ae5
parentd6626f85e661f1aedea636b2f7bcde9cfa1f5e5e
parentd49e24866f6f989a0e3a00a29281f1f9a1a1d54c
Merge branch 'master' into ff/rrdd

Conflicts:

src/rrd_lastupdate.c
src/rrd_update.c
14 files changed:
configure.ac
doc/rrdgraph.pod
src/rrd.h
src/rrd_dump.c
src/rrd_fetch.c
src/rrd_graph.c
src/rrd_graph.h
src/rrd_info.c
src/rrd_last.c
src/rrd_lastupdate.c
src/rrd_tool.c
src/rrd_tool.h
src/rrd_update.c
src/rrd_xport.c