Merge remote-tracking branch 'github/pr/1130'
authorFlorian Forster <octo@collectd.org>
Mon, 13 Jul 2015 10:20:54 +0000 (12:20 +0200)
committerFlorian Forster <octo@collectd.org>
Mon, 13 Jul 2015 10:20:54 +0000 (12:20 +0200)
commitff17a1ce15e2bb1ea43c05974a17901ca43bc0d7
tree272949ed39e14a5a58f317a714eab7cacb013225
parent64581b01b20c9bccd99dd7ba0537e563ecfb4ca6
parentb267792073e9a88cece5574782760d17db12a15d
Merge remote-tracking branch 'github/pr/1130'