Merge branch 'collectd-5.2'
authorFlorian Forster <octo@collectd.org>
Wed, 10 Apr 2013 01:44:29 +0000 (18:44 -0700)
committerFlorian Forster <octo@collectd.org>
Wed, 10 Apr 2013 01:44:29 +0000 (18:44 -0700)
commitd11c1f68458465f1c9dcfd0396704b7fba7d5804
treecf0ccd276ada3849e2bb7d28c4a6b9f6300bdef9
parent33fdd7d22e7e122c337b0092d3c8d26e5f3caa70
parent424841e452e65ab2f470b2553d425cfed9b42b64
Merge branch 'collectd-5.2'