From: Florian Forster <octo@collectd.org>
Date: Tue, 2 Oct 2012 20:04:08 +0000 (+0200)
Subject: Merge branch 'mlsr/uptime-aix'
X-Git-Tag: collectd-5.2.0~49
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=61b3f5ec3fde284e56620fdab11b246e3dd6e311;p=thirdparty%2Fcollectd.git

Merge branch 'mlsr/uptime-aix'
---

61b3f5ec3fde284e56620fdab11b246e3dd6e311