Merge branch 'collectd-4.10'
authorFlorian Forster <octo@huhu.verplant.org>
Mon, 3 May 2010 07:48:34 +0000 (09:48 +0200)
committerFlorian Forster <octo@huhu.verplant.org>
Mon, 3 May 2010 07:48:34 +0000 (09:48 +0200)
commit068146351a826b413ea6dedf1c834e31e0ad11f6
treefe3698826f409d2c60b98da4a8368eb18aef449e
parent921d4724aaf1e59b9bf5b1839bd12a18d88d198b
parent7970f59dff204401069cfc53f7c53f207a681428
Merge branch 'collectd-4.10'
src/Makefile.am