Merge branch 'vb/df'
authorFlorian Forster <octo@collectd.org>
Sat, 1 Jun 2013 07:25:19 +0000 (09:25 +0200)
committerFlorian Forster <octo@collectd.org>
Sat, 1 Jun 2013 07:25:19 +0000 (09:25 +0200)
commit7e2a10e78c6fd263d0360bf929158dc1b2257704
treefc6d43439c14d1c18d35b1055db7ac99842b1d52
parentb5c2af0c579603aa731550cdc4ea0ac1aa1be5d3
parente4fcf03ee7504cc679b5463700966519fb85f065
Merge branch 'vb/df'