Merge remote-tracking branch 'github/master'
authorFlorian Forster <octo@collectd.org>
Sat, 6 Aug 2016 19:15:18 +0000 (21:15 +0200)
committerFlorian Forster <octo@collectd.org>
Sat, 6 Aug 2016 19:15:18 +0000 (21:15 +0200)
commit178bafa2df4f8aed33772af00ebe69f6359c879a
tree17337b515723ef9327dae49b3aa6b563c3de2fb9
parent474d70e02d04de92aa7503b3887989729bbbff02
parent673fec72cf9ec4b31960bc5559023cfcaee28e0d
Merge remote-tracking branch 'github/master'
configure.ac