Merge remote-tracking branch 'origin/pr/651'
authorMarc Fournier <marc.fournier@camptocamp.com>
Tue, 19 May 2015 11:34:10 +0000 (13:34 +0200)
committerMarc Fournier <marc.fournier@camptocamp.com>
Tue, 19 May 2015 11:34:10 +0000 (13:34 +0200)
commit8395c8dbb8f5a872c5cde8db4c47a34cdb5f7c2f
treee1db34b90304fce85e4885b7c0eae2c5f86d0041
parent1b6906d2288a984af21f43aabc3d71d3d1024b1b
parent363bd0300297144a29b58cc813b23d9353525178
Merge remote-tracking branch 'origin/pr/651'

Conflicts:
contrib/redhat/collectd.spec
AUTHORS
README
configure.ac
contrib/redhat/collectd.spec
src/Makefile.am
src/collectd.conf.in
src/collectd.conf.pod