Merge branch 'ps/tokyotyrant'
authorFlorian Forster <octo@leeloo.lan.home.verplant.org>
Sat, 11 Jul 2009 12:59:21 +0000 (14:59 +0200)
committerFlorian Forster <octo@leeloo.lan.home.verplant.org>
Sat, 11 Jul 2009 12:59:21 +0000 (14:59 +0200)
1  2 
src/collectd.conf.in
src/collectd.conf.pod

Simple merge
Simple merge