Code

Merge remote-tracking branch 'github/pr/1036'
authorFlorian Forster <octo@collectd.org>
Sat, 6 Jun 2015 19:43:28 +0000 (21:43 +0200)
committerFlorian Forster <octo@collectd.org>
Sat, 6 Jun 2015 19:43:28 +0000 (21:43 +0200)
commit30eeeee996124de666f907877f8196e5580101ed
treea6bbb3527f78a6334fdd50583691867a49cb1b76
parent3f9f6b9bc37cfd8ee3eb7a21cb895ff524c533c8
parent111f4f08030989bf4a2282905b97f45a8cab1c8d
Merge remote-tracking branch 'github/pr/1036'

Conflicts:
src/processes.c
src/processes.c