Code

Merge remote-tracking branch 'github/pr/2012' into collectd-5.6
authorFlorian Forster <octo@collectd.org>
Sat, 29 Oct 2016 20:08:32 +0000 (22:08 +0200)
committerFlorian Forster <octo@collectd.org>
Sat, 29 Oct 2016 20:08:32 +0000 (22:08 +0200)
commit58ea9b453b831ce4436f0fbba68edb92cfa8389d
tree1c185b3a740be6fc49e3fde36bde920273215c3a
parent58acba67f2a814698e7ebef1c00ec35fa21ef740
parentb7e942f07f8cc3b4915aa95477aead8b5a372879
Merge remote-tracking branch 'github/pr/2012' into collectd-5.6