Merge branch 'collectd-3.11' into collectd-4.0
authorFlorian Forster <octo@leeloo.lan.home.verplant.org>
Fri, 28 Sep 2007 11:45:39 +0000 (13:45 +0200)
committerFlorian Forster <octo@leeloo.lan.home.verplant.org>
Fri, 28 Sep 2007 11:45:39 +0000 (13:45 +0200)
commitbd66a09b35da21dcb405650ae4587bf2ca811438
treeb0e765d699612d95d312aad1df6589221b818b55
parentbb660d244f59edb16bfbb268f9b4894f878cb771
parentb823f25ad764b81de842c4c0db37b6b22aeac97c
Merge branch 'collectd-3.11' into collectd-4.0

Conflicts:

ChangeLog
configure.in
src/wireless.c
ChangeLog
src/wireless.c