Merge branch 'ps/http'

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

Sat, 29 Aug 2009 08:45:38 +0000 (10:45 +0200)

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

Sat, 29 Aug 2009 08:45:38 +0000 (10:45 +0200)
author Florian Forster <octo@leeloo.lan.home.verplant.org>
Sat, 29 Aug 2009 08:45:38 +0000 (10:45 +0200)
committer Florian Forster <octo@leeloo.lan.home.verplant.org>
Sat, 29 Aug 2009 08:45:38 +0000 (10:45 +0200)
diff --cc AUTHORS
Simple merge
diff --cc README
Simple merge
diff --cc configure.in
Simple merge
diff --cc src/Makefile.am
Simple merge
diff --cc src/collectd.conf.pod
Simple merge
author	Florian Forster <octo@leeloo.lan.home.verplant.org>
	Sat, 29 Aug 2009 08:45:38 +0000 (10:45 +0200)
committer	Florian Forster <octo@leeloo.lan.home.verplant.org>
	Sat, 29 Aug 2009 08:45:38 +0000 (10:45 +0200)
		1	2
AUTHORS	patch \|	diff1 \|	diff2 \|	blob \| history
README	patch \|	diff1 \|	diff2 \|	blob \| history
configure.in	patch \|	diff1 \|	diff2 \|	blob \| history
src/Makefile.am	patch \|	diff1 \|	diff2 \|	blob \| history
src/collectd.conf.pod	patch \|	diff1 \|	diff2 \|	blob \| history