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)
commitcfe801cf0236ea2fade924e0f2b5ce3d1a51698a
tree791fa7a2499a2332d17437cd828f52a200dc1e1f
parent52b5def4017f552f02eb3ca5716c4ee9d7a43145
parent42af0f20eb918019564eeae3339f94cea7e49834
Merge remote-tracking branch 'origin/pr/925'
README
configure.ac
src/Makefile.am
src/collectd.conf.in
src/collectd.conf.pod
src/types.db