![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Florian Forster <octo@collectd.org> | |
| Sat, 23 Mar 2013 09:13:02 +0000 (10:13 +0100) | ||
| committer | Florian Forster <octo@collectd.org> | |
| Sat, 23 Mar 2013 09:13:02 +0000 (10:13 +0100) | ||
| commit | 632e1074beb71748f866087bcdf9b0ba1b1d2405 | |
| tree | 108624dc92921f77f2b811b94c5514d28a0b64e6 | tree | snapshot |
| parent | 9de567ab3fd0725ce08f0581b6374518e1220e7e | commit | diff |
| parent | 21b429b6b5ecd2f9820d9a2516c12577a0e59d19 | commit | diff |
Merge branch 'collectd-5.2'
Conflicts:
configure.in
Conflicts:
configure.in
| configure.in | diff1 | | diff2 | | blob | history |