Merge remote-tracking branch 'origin/pr/490' into collectd-5.3
authorMarc Fournier <marc.fournier@camptocamp.com>
Thu, 23 Jan 2014 13:17:25 +0000 (14:17 +0100)
committerMarc Fournier <marc.fournier@camptocamp.com>
Thu, 23 Jan 2014 13:17:25 +0000 (14:17 +0100)

Trivial merge