![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Florian Forster <octo@leeloo.lan.home.verplant.org> | |
| Thu, 15 Mar 2007 17:33:12 +0000 (18:33 +0100) | ||
| committer | Florian Forster <octo@leeloo.lan.home.verplant.org> | |
| Thu, 15 Mar 2007 17:33:12 +0000 (18:33 +0100) | ||
| commit | d561a8387f633491bdcd7fe6964f0b63ae694af5 | |
| tree | 165e9d28c88719260286161c860025b71528a583 | tree | snapshot |
| parent | 5bc935fb1fd57cb9048660740c3d62606964f76c | commit | diff |
| parent | 35248bcc734467e1f1ae39b4a6470849e57624bf | commit | diff |
Merge branch 'master' into collectd-4
Conflicts:
configure.in
Conflicts:
configure.in
| configure.in | diff1 | | diff2 | | blob | history |
| src/Makefile.am | diff1 | | diff2 | | blob | history |
| src/collectd.conf.in | diff1 | | diff2 | | blob | history |
| src/collectd.conf.pod | diff1 | | diff2 | | blob | history |