Code

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)
commit6ea00a8e17fccbac0cc5dee711ee2e4cb73bdaaa
tree309f768be00d681966c87e88ac723986c99619bc
parentdc1acaab169b0f1b2b43fed1b7044d19e6d92844
parent496d4e6272689604c4f4daab6823c99dd4e4fb50
Merge branch 'ps/tokyotyrant'
src/collectd.conf.in
src/collectd.conf.pod