Merge remote-tracking branch 'github/pr/697'
authorFlorian Forster <octo@collectd.org>
Tue, 23 Sep 2014 14:13:52 +0000 (07:13 -0700)
committerFlorian Forster <octo@collectd.org>
Tue, 23 Sep 2014 14:13:52 +0000 (07:13 -0700)
commit2a8ee0dbb694eac183fff0306ea9c41c46facad7
tree21ad8a241a175fe05f148654192da765a1173588
parent0e363577f4d0a94bef1929f9d9829fb94765ec1e
parentf4a2e0b5776f18ed1251688a785adc7f802a01d6
Merge remote-tracking branch 'github/pr/697'