Merge branch 'pr/36' into mqtt
authorFlorian Forster <octo@collectd.org>
Thu, 9 Jul 2015 07:35:08 +0000 (09:35 +0200)
committerFlorian Forster <octo@collectd.org>
Thu, 9 Jul 2015 07:35:08 +0000 (09:35 +0200)
commitad8f6ed16e234ebe4f52d0e3d3c3f4695c6e1d16
tree12d9abdccc39847cf87dfdc361ac45a7d1c57391
parent416aab49a9ae19b993b747b5fca92fc3501fff5d
parent84d1ececf064d50b435e1c15c2d84347926298ab
Merge branch 'pr/36' into mqtt