Merge branch 'master' of git://github.com/octo/collectd
authorGarret Heaton <powdahound@gmail.com>
Mon, 9 Nov 2009 16:53:51 +0000 (08:53 -0800)
committerGarret Heaton <powdahound@gmail.com>
Mon, 9 Nov 2009 16:53:51 +0000 (08:53 -0800)
commit0f512f5546c5d45721171d6dc891488b47b601a3
tree5467f17a3bd0eaace09bd8fe73c285297de772af
parentc901e521eea4a7f066e9e359e8dca49935064d61
parent9fbaea758b3821d305a89782b8f260cc787e21ab
Merge branch 'master' of git://github.com/octo/collectd