Code

Merge branch 'collectd-4.9'
authorFlorian Forster <octo@leeloo.lan.home.verplant.org>
Sat, 1 May 2010 07:36:08 +0000 (09:36 +0200)
committerFlorian Forster <octo@leeloo.lan.home.verplant.org>
Sat, 1 May 2010 07:36:08 +0000 (09:36 +0200)
commit37676c3b280e15df8efbef2a3dc6c9096d1ae03b
treeb3ce0083815287f37982d71e32d3b61424fd81a8
parentbf3e1d8dac9fc28687a4c91160ed6d944048eb09
parent0bd574a28c06090f0c4b056f8a78e455455a6330
Merge branch 'collectd-4.9'

Conflicts:
configure.in
configure.in