Merge branch 'udev-disk'
authorMarc Fournier <marc.fournier@camptocamp.com>
Thu, 24 Jul 2014 12:51:23 +0000 (14:51 +0200)
committerMarc Fournier <marc.fournier@camptocamp.com>
Thu, 24 Jul 2014 12:51:23 +0000 (14:51 +0200)
1  2 
configure.ac
src/collectd.conf.pod

diff --cc configure.ac
Simple merge
Simple merge