![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Florian Forster <octo@noris.net> | |
| Fri, 10 Oct 2008 07:02:33 +0000 (09:02 +0200) | ||
| committer | Florian Forster <octo@noris.net> | |
| Fri, 10 Oct 2008 07:02:33 +0000 (09:02 +0200) | ||
| commit | 332cf199806de625661fa3a9bf9555f7a47ba9f9 | |
| tree | 5c9a395cb6de9cff1adfac3fe21158df8233fe91 | tree | snapshot |
| parent | 86f6ca2b5631e3ba487e420a670a7203260c8371 | commit | diff |
| parent | 2c2e9a297f59c110ddd4adef6293fe80f39f15b7 | commit | diff |
Merge branch 'collectd-4.5'
Conflicts:
configure.in
Conflicts:
configure.in
| README | diff1 | | diff2 | | blob | history |
| configure.in | diff1 | | diff2 | | blob | history |