Merge branch 'master' into er/ted
authorFlorian Forster <octo@leeloo.lan.home.verplant.org>
Sat, 14 Mar 2009 17:52:58 +0000 (18:52 +0100)
committerFlorian Forster <octo@leeloo.lan.home.verplant.org>
Sat, 14 Mar 2009 17:52:58 +0000 (18:52 +0100)
commit2c2affa00540642ed087f0f15178eb8cd653fdac
treebde8eec4c89d76537b26bb330aab0b466dc6ffa2
parent2b475288859e894785e20775a6c8d7b9b95c881c
parentd37ebe6eb6dd2bbf8213a924dfbce6e91945aab8
Merge branch 'master' into er/ted
configure.in
src/Makefile.am
src/collectd.conf.pod