Merge branch 'master' into ss/graphite
authorFlorian Forster <octo@collectd.org>
Mon, 6 Feb 2012 13:37:52 +0000 (14:37 +0100)
committerFlorian Forster <octo@collectd.org>
Mon, 6 Feb 2012 13:37:52 +0000 (14:37 +0100)
commit5e1d7902ffae810f851f4298683f675fc538f5bd
tree32247385413b8223aae0c5f2a5d81b4371fea7f6
parent7353a23cf525e3e820e32076c89eae8bbb2d3a3d
parentd0efcb2eda3317f1b2f8da154a8722cdef03159a
Merge branch 'master' into ss/graphite