![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Florian Forster <octo@noris.net> | |
| Fri, 31 Oct 2008 10:31:43 +0000 (11:31 +0100) | ||
| committer | Florian Forster <octo@noris.net> | |
| Fri, 31 Oct 2008 10:31:43 +0000 (11:31 +0100) | ||
| commit | c87da66245197f489bb0e9efffc23538cf07e70b | |
| tree | a96e3b312d9db3e841e2229c64d5e27cd5d2ae61 | tree | snapshot |
| parent | a2e60e30e09c9c7d881fe288074e20eb0d748219 | commit | diff |
| parent | a3b477b60e7215ae813d665e22325b4b318646ef | commit | diff |
Merge branch 'ff/oracle'
Conflicts:
configure.in
Conflicts:
configure.in
| configure.in | diff1 | | diff2 | | blob | history |
| src/Makefile.am | diff1 | | diff2 | | blob | history |
| src/collectd.conf.pod | diff1 | | diff2 | | blob | history |