Merge branch 'collectd-5.5'
authorRuben Kerkhof <ruben@rubenkerkhof.com>
Wed, 25 May 2016 16:35:53 +0000 (18:35 +0200)
committerRuben Kerkhof <ruben@rubenkerkhof.com>
Wed, 25 May 2016 16:35:53 +0000 (18:35 +0200)
commitd67b510b1ec7c17b6e1f65e40b8d8fdb2f33c857
treed541289bc52e7f91c540cb8a7471589d4c25dd70
parentad3f9ec5e60b03123312a2fe7c5a0063c45af42a
parent7e23de8fc6c1b9fe0aa2bc2ea84bbc0e5997f0c6
Merge branch 'collectd-5.5'
src/Makefile.am