Merge branch 'collectd-3.10'
authorFlorian Forster <octo@huhu.verplant.org>
Wed, 19 Jul 2006 16:51:35 +0000 (18:51 +0200)
committerFlorian Forster <octo@huhu.verplant.org>
Wed, 19 Jul 2006 16:51:35 +0000 (18:51 +0200)
commit5ea76bea7a7e7d53960c90779f744830f76adb3e
tree90c08abebbf8e2546dc6218b682ad1bb19aaf80c
parent6f5f56a90d63d48bf8d4b11f071a868eb27932b7
parent8a94ccd77411761bc33dd5c163f36eb4c954237f
Merge branch 'collectd-3.10'
configure.in
src/apcups.c