Merge branch 'collectd-5.5'
authorRuben Kerkhof <ruben@rubenkerkhof.com>
Wed, 25 May 2016 14:54:54 +0000 (16:54 +0200)
committerRuben Kerkhof <ruben@rubenkerkhof.com>
Wed, 25 May 2016 14:54:54 +0000 (16:54 +0200)
Conflicts:
configure.ac


No differences found