![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Florian Forster <octo@collectd.org> | |
| Sun, 11 Nov 2012 11:43:52 +0000 (12:43 +0100) | ||
| committer | Florian Forster <octo@collectd.org> | |
| Sun, 11 Nov 2012 11:43:52 +0000 (12:43 +0100) | ||
| commit | 1d7439282ad415e7d1630598becae3109c7d2735 | |
| tree | c121a118aef6c30e5739bc30f9c6532f095d36e0 | tree | snapshot |
| parent | 642bde1ec7306e5dc0fed28fda72807f2d97a3fd | commit | diff |
| parent | 494386dffbab10af47c08846e6e3fec2b2ae5107 | commit | diff |
Merge branch 'collectd-5.0' into collectd-5.1
Conflicts:
ChangeLog
version-gen.sh
Conflicts:
ChangeLog
version-gen.sh
| ChangeLog | diff1 | | diff2 | | blob | history |
| configure.in | diff1 | | diff2 | | blob | history |
| src/Makefile.am | diff1 | | diff2 | | blob | history |