Merge branch 'master' into ff/rrdd

author Florian Forster <octo@leeloo.home.verplant.org>

Sun, 14 Sep 2008 08:23:10 +0000 (10:23 +0200)

committer Florian Forster <octo@leeloo.home.verplant.org>

Sun, 14 Sep 2008 08:23:10 +0000 (10:23 +0200)
author Florian Forster <octo@leeloo.home.verplant.org>
Sun, 14 Sep 2008 08:23:10 +0000 (10:23 +0200)
committer Florian Forster <octo@leeloo.home.verplant.org>
Sun, 14 Sep 2008 08:23:10 +0000 (10:23 +0200)
diff --cc configure.ac
Simple merge
diff --cc doc/rrdgraph.pod
Simple merge
diff --cc src/Makefile.am
Simple merge
diff --cc src/rrd_graph.c
Simple merge
author	Florian Forster <octo@leeloo.home.verplant.org>
	Sun, 14 Sep 2008 08:23:10 +0000 (10:23 +0200)
committer	Florian Forster <octo@leeloo.home.verplant.org>
	Sun, 14 Sep 2008 08:23:10 +0000 (10:23 +0200)
		1	2
configure.ac	patch \|	diff1 \|	diff2 \|	blob \| history
doc/rrdgraph.pod	patch \|	diff1 \|	diff2 \|	blob \| history
src/Makefile.am	patch \|	diff1 \|	diff2 \|	blob \| history
src/rrd_graph.c	patch \|	diff1 \|	diff2 \|	blob \| history