Merge branch 'ok/disk' into collectd-4.4
authorFlorian Forster <octo@noris.net>
Mon, 5 May 2008 12:04:31 +0000 (14:04 +0200)
committerFlorian Forster <octo@noris.net>
Mon, 5 May 2008 12:04:31 +0000 (14:04 +0200)
commitebdc9011b75c4c1478fbe02eb1cb9c69795288f9
tree0352185193fb03124dddaa4855310231946f60ba
parentaa3a8be60d82cc31e776acbfed30451c2afc45a9
parent67c95c066e1e872357b42700a87aa58874873a63
Merge branch 'ok/disk' into collectd-4.4

Conflicts:

configure.in
configure.in
src/Makefile.am