Code

Merge remote-tracking branch 'github/pr/413' into collectd-5.4
authorFlorian Forster <octo@collectd.org>
Wed, 28 Aug 2013 13:22:37 +0000 (15:22 +0200)
committerFlorian Forster <octo@collectd.org>
Wed, 28 Aug 2013 13:22:37 +0000 (15:22 +0200)
1  2 
src/cgroups.c

diff --cc src/cgroups.c
Simple merge