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

[Florian Forster]

 configure.in    |    1 +
 src/Makefile.am |    3 +++
 src/uptime.c    |   30 +++++++++++++++++++++++++++++-
 3 files changed, 33 insertions(+), 1 deletion(-)

New commits:
commit 61b3f5ec3fde284e56620fdab11b246e3dd6e311
Merge: ce2d1ba e8b64d2
Author: Florian Forster <octo at collectd.org>
Date:   Tue Oct 2 22:04:08 2012 +0200

    Merge branch 'mlsr/uptime-aix'

commit e8b64d209c89fceaf71222c3eb91f12ce7cbe0d1
Author: Manuel Luis Sanmartin Rozada <manuel.luis at gmail.com>
Date:   Sun Sep 30 14:47:38 2012 +0200

    Add libperfstat in Makefile.am

commit 48096d34f886cdb8b37e999c690260274e1d9449
Author: Manuel Luis Sanmartín Rozada <manuel.luis at gmail.com>
Date:   Wed Sep 5 14:01:40 2012 +0200

    Add AIX support for uptime plugin.