Code

Merge remote-tracking branch 'github/pr/1056'
authorFlorian Forster <octo@collectd.org>
Mon, 1 Jun 2015 17:15:58 +0000 (19:15 +0200)
committerFlorian Forster <octo@collectd.org>
Mon, 1 Jun 2015 17:15:58 +0000 (19:15 +0200)
commit741e018fff531bfe914781489d9b2c7a002f2bc7
tree65df31cf17d63b2d171618e1855430106671ac04
parent9fe07359e6d4e2e76bbb2424b895e3a5142e7307
parente4fe9b4d69c69d922cad1272104fdb8de5c24faf
Merge remote-tracking branch 'github/pr/1056'