Code

Merge branch 'ff/oracle'
authorFlorian Forster <octo@noris.net>
Fri, 31 Oct 2008 10:31:43 +0000 (11:31 +0100)
committerFlorian Forster <octo@noris.net>
Fri, 31 Oct 2008 10:31:43 +0000 (11:31 +0100)
commitc87da66245197f489bb0e9efffc23538cf07e70b
treea96e3b312d9db3e841e2229c64d5e27cd5d2ae61
parenta2e60e30e09c9c7d881fe288074e20eb0d748219
parenta3b477b60e7215ae813d665e22325b4b318646ef
Merge branch 'ff/oracle'

Conflicts:

configure.in
configure.in
src/Makefile.am
src/collectd.conf.pod