Merge branch 'er/ted'
authorFlorian Forster <octo@leeloo.lan.home.verplant.org>
Tue, 31 Mar 2009 07:45:33 +0000 (09:45 +0200)
committerFlorian Forster <octo@leeloo.lan.home.verplant.org>
Tue, 31 Mar 2009 07:45:33 +0000 (09:45 +0200)
commit79367f94108a13a62f1ad3ef9d1045c5401e82c4
tree890b3a48fdb6407560ae1b2a69fbde7b44b72097
parentbab5b0e471b1e7cd86595873e2f926943cde811b
parent5e4647f46f5dff51cfabc72ea649bb064881b91b
Merge branch 'er/ted'
configure.in
src/Makefile.am
src/collectd.conf.pod