Code

Merge remote-tracking branch 'origin/collectd-5.2' into collectd-5.2
authorFlorian Forster <octo@collectd.org>
Sun, 27 Jan 2013 13:35:25 +0000 (14:35 +0100)
committerFlorian Forster <octo@collectd.org>
Sun, 27 Jan 2013 13:35:25 +0000 (14:35 +0100)
commit8291596f0172404039f0928bcaea4b1e4cafbc97
treeb8848c92f4e81cf8649f0a57e7a1e2e91e43f47d
parent26ff771b2487cd8e0492f383ecc9b7bf531b3e25
parent7bbba254348a7fa98c4337455a3e0eae88ce0e86
Merge remote-tracking branch 'origin/collectd-5.2' into collectd-5.2