Code

Merge branch 'collectd-5.4' into collectd-5.5
authorRuben Kerkhof <ruben@rubenkerkhof.com>
Fri, 10 Jun 2016 07:47:53 +0000 (09:47 +0200)
committerRuben Kerkhof <ruben@rubenkerkhof.com>
Fri, 10 Jun 2016 07:47:53 +0000 (09:47 +0200)
commit65c20e41cfad6e7ab024983f561835fd347124ce
tree5657d62fe8b95ee29975a42370de9e584526d84a
parent22651d8d4dc49e24bbac2cd34e0642dcf3639c97
parent21602dea4a6ac2a9003c2f2b0aa4c87ce5e475bf
Merge branch 'collectd-5.4' into collectd-5.5