Merge branch 'master' of git://git.verplant.org/collectd
authorFlorian Forster <octo@noris.net>
Wed, 23 Jul 2008 15:18:13 +0000 (17:18 +0200)
committerFlorian Forster <octo@noris.net>
Wed, 23 Jul 2008 15:18:13 +0000 (17:18 +0200)
commit0421d0d777f6df3cf78fd5366c82b0ed7adb9684
tree64df678653d234e4102416a7ced48d907d4ee3df
parentc71b8d22d731098030a81dd974f2f76ac7f7b32e
parent92445ff3363441d0f515de4a3ab92a504cfc0366
Merge branch 'master' of git://git.verplant.org/collectd
src/Makefile.am
src/collectd.conf.pod