Code

Merge remote-tracking branch 'github/pr/387' master
authorFlorian Forster <octo@collectd.org>
Wed, 7 Aug 2013 07:40:26 +0000 (09:40 +0200)
committerFlorian Forster <octo@collectd.org>
Wed, 7 Aug 2013 07:40:26 +0000 (09:40 +0200)
commit7377d9356d1e698e4177cd81c7c03924ba62ad5a
tree505efe75166621cfb1c803aef92043dfe239478c
parent7fc4c1f412c4002b787b5ce24b08e3091ced08a5
parentc97eef40cf19b106e6a00006a3b8f3f9ee409045
Merge remote-tracking branch 'github/pr/387'