Merge branch 'master' into ff/rrdd
authorFlorian Forster <octo@verplant.org>
Mon, 8 Sep 2008 07:52:30 +0000 (09:52 +0200)
committerFlorian Forster <octo@verplant.org>
Mon, 8 Sep 2008 07:52:30 +0000 (09:52 +0200)
Conflicts:

doc/rrdgraph.pod
src/librrd.sym.in
src/rrd_lastupdate.c
src/rrd_update.c


No differences found