Code

Merge branch 'collectd-5.0'
authorFlorian Forster <octo@collectd.org>
Sun, 19 Feb 2012 10:21:31 +0000 (11:21 +0100)
committerFlorian Forster <octo@collectd.org>
Sun, 19 Feb 2012 10:21:31 +0000 (11:21 +0100)
commit45aa67ef031ed2b8083f92efa2cbb76e0da8c02e
tree576705fa511809497b293495152e06445a0f5c75
parentc149ae31b04a082f7915f39e8d51ddec4a0595f8
parent31ec341b9b5271aee8595a6622137820c3ea7b6f
Merge branch 'collectd-5.0'

Conflicts:
configure.in

Change-Id: Ifffa7df6b6c758650af7d942c26c8bd89568d8ea
ChangeLog
configure.in
src/collectd.conf.pod