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)
Conflicts:
contrib/redhat/collectd.spec


No differences found