![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | octo <octo> | |
| Fri, 16 Jun 2006 23:02:01 +0000 (23:02 +0000) | ||
| committer | octo <octo> | |
| Fri, 16 Jun 2006 23:02:01 +0000 (23:02 +0000) | ||
| commit | 81a3ec19d95506446372371a45e3aa24ab24c722 | |
| tree | 5a127a73f8773e3b05e8aec5eda78336177323f6 | tree | snapshot |
| parent | 6f7f9185a4b85b442d26821b5df8742466d2e682 | commit | diff |
| parent | 99274702d4e4b42139244b549df1a01f19288b4f | commit | diff |
octo@leeloo:~/collectd $ svn merge -r822:823 branches/disk-linux trunk