Merge branch 'collectd-5.5'
authorRuben Kerkhof <ruben@rubenkerkhof.com>
Tue, 1 Mar 2016 12:18:54 +0000 (13:18 +0100)
committerRuben Kerkhof <ruben@rubenkerkhof.com>
Tue, 1 Mar 2016 12:18:54 +0000 (13:18 +0100)
commitb76f88c5bafa82e3c939eb65c13acd431e07cc01
treef5a70d135def4514bd78d2f6f93f6183e4ae6f5e
parentb24fe01f603e1422de29c2cf090eabb043df1965
parent11733d9b2702d81c1e75edaea277afac178d2717
Merge branch 'collectd-5.5'
src/Makefile.am