[collectd-changes] collectd, the system statistics collection daemon: Changes to 'master'

[Florian Forster]

 COPYING |  340 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 340 insertions(+), 0 deletions(-)

New commits:
commit 6a9506cfaf6a982c45723824e9380e39d3a8c5da
Merge: 249d57767a99ff3aa28661758a7a9fb58058fab0 79e2f5ddc8bffe7ba604530b6090b5d7f7ec9bb1
Author: Florian Forster <octo at leeloo.lan.home.verplant.org>
Date:   Thu Apr 3 09:39:03 2008 +0200

    Merge branch 'collectd-4.3'

commit 79e2f5ddc8bffe7ba604530b6090b5d7f7ec9bb1
Merge: 4fb5d4b471e3f6a24d7cd36272e48e57bcb2c68f 23fccc73750af9440eabaef21c6a0955faf14556
Author: Florian Forster <octo at leeloo.lan.home.verplant.org>
Date:   Thu Apr 3 09:38:56 2008 +0200

    Merge branch 'collectd-4.2' into collectd-4.3

commit 23fccc73750af9440eabaef21c6a0955faf14556
Author: Florian Forster <octo at leeloo.lan.home.verplant.org>
Date:   Thu Apr 3 09:35:28 2008 +0200

    COPYING: Added the file (including the GPLv2).
    
    Newer versions of automake copy the GPLv3 when invoked with ``--add-missing''
    which is not what we want.