Merge branch 'collectd-5.6' into collectd-5.7
authorRuben Kerkhof <ruben@rubenkerkhof.com>
Sun, 19 Feb 2017 11:59:13 +0000 (12:59 +0100)
committerRuben Kerkhof <ruben@rubenkerkhof.com>
Sun, 19 Feb 2017 11:59:13 +0000 (12:59 +0100)
commitf7e2d82c4d016df72c55e85bb9c5bc9ba08d5f91
tree07687e2663a1faf1d6f6a62e46750217530bfadd
parent5cf242b078f236b003f609c6419b13b099e0d2a5
parent33c0e7174035b80b32c025be10a056a590dada7a
Merge branch 'collectd-5.6' into collectd-5.7
src/Makefile.am