Code

Merge commit 'octo/master'
authorSven Trenkel <collectd@semidefinite.de>
Thu, 1 Oct 2009 11:25:17 +0000 (13:25 +0200)
committerSven Trenkel <collectd@semidefinite.de>
Thu, 1 Oct 2009 11:25:17 +0000 (13:25 +0200)
commit8d3fe5fb26cb6de1ee58cba572cb38ac93e906b2
tree847e389c5f104dbefb39285492a59809975ff1f7
parent98b20a22c116c099f199616d690761262347f81a
parent902f7621661d97dac0c7bc83f39acbf76a3b947b
Merge commit 'octo/master'