Code

Merge remote-tracking branch 'github/collectd-5.2' into collectd-5.2
authorFlorian Forster <octo@collectd.org>
Wed, 28 Nov 2012 07:17:39 +0000 (08:17 +0100)
committerFlorian Forster <octo@collectd.org>
Wed, 28 Nov 2012 07:17:39 +0000 (08:17 +0100)
commit38b630c605adec2638b29fc257b823b0a638080c
treee42ee7f969a3dde89fbd3c05b149159f5915eb03
parent3e7c4f239aadb6d99e8b18b4bbd9cdc2f7daeddd
parent82f22e281ac0c4280da213fce7a6ae0feb1815c0
Merge remote-tracking branch 'github/collectd-5.2' into collectd-5.2