![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Florian Forster <octo@leeloo.lan.home.verplant.org> | |
| Mon, 21 Jan 2008 09:36:57 +0000 (10:36 +0100) | ||
| committer | Florian Forster <octo@leeloo.lan.home.verplant.org> | |
| Mon, 21 Jan 2008 09:36:57 +0000 (10:36 +0100) | ||
| commit | 1b8000f6a308481daa4a6a337600e81c45ed9754 | |
| tree | 0965826d56de551a5c81408ba91e9b36c78b29a5 | tree | snapshot |
| parent | 225494e854ddaa1c0570ac9a5fa15380b333a919 | commit | diff |
| parent | d539c6cdfa3c8664032aa53b0285b5e12882f424 | commit | diff |
Merge branch 'collectd-4.1' into collectd-4.2
Conflicts:
ChangeLog
version-gen.sh
Conflicts:
ChangeLog
version-gen.sh
| ChangeLog | diff1 | | diff2 | | blob | history |