Code

Merge branch 'collectd-5.5'
authorMarc Fournier <marc.fournier@camptocamp.com>
Mon, 2 May 2016 14:14:48 +0000 (16:14 +0200)
committerMarc Fournier <marc.fournier@camptocamp.com>
Mon, 2 May 2016 14:14:48 +0000 (16:14 +0200)
commit21058a13ed34ade6d2de0f54e4216b255d033af1
tree0a9fc7871da4d780b4c1630969503e9cd41dedd6
parent4cc3fe8eb3a74650a01a5464ddb9f8d67e4e17dd
parent9d8118420f6cdc304f49d56464428b417d42f981
Merge branch 'collectd-5.5'