Code

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)
commitd2e9e78adec531d4c90460c9a39ccf6ed388cd69
tree6ced77c298663c9447cdb30b3db7b81b686bddc2
parentaffac33e83584e7538c358e3bd0a587d0c692bc3
parent1c04bafe27990a337df6b9a8582669fe110eb2ae
Merge remote-tracking branch 'origin/pr/490' into collectd-5.3