Merge branch 'collectd-4.5'
authorFlorian Forster <octo@noris.net>
Fri, 28 Nov 2008 11:00:15 +0000 (12:00 +0100)
committerFlorian Forster <octo@noris.net>
Fri, 28 Nov 2008 11:00:15 +0000 (12:00 +0100)
commitab4f1d2683276954ac03d3e47ad34ad75c4bba26
tree2eb14a2f341e57442504f661064edbc48eabb57e
parent528232d33bd81c20c61df6f694c7655bda416720
parent68ab7da7a51018a00e6e03347182b988a30296a7
Merge branch 'collectd-4.5'