Code

Merge remote-tracking branch 'origin/pr/925'
authorMarc Fournier <marc.fournier@camptocamp.com>
Wed, 8 Apr 2015 22:32:50 +0000 (00:32 +0200)
committerMarc Fournier <marc.fournier@camptocamp.com>
Wed, 8 Apr 2015 22:32:50 +0000 (00:32 +0200)
1  2 
README
configure.ac
src/Makefile.am
src/collectd.conf.in
src/collectd.conf.pod
src/types.db

diff --cc README
Simple merge
diff --cc configure.ac
Simple merge
diff --cc src/Makefile.am
Simple merge
Simple merge
Simple merge
diff --cc src/types.db
Simple merge