![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Florian Forster <octo@noris.net> | |
| Tue, 29 Apr 2008 14:52:08 +0000 (16:52 +0200) | ||
| committer | Florian Forster <octo@noris.net> | |
| Tue, 29 Apr 2008 14:52:08 +0000 (16:52 +0200) | ||
| commit | c192de2c944bf9c73903b4a6ac8379db3acc5955 | |
| tree | 516491f700ac1df2d26d0e21302de1998b7c43d6 | tree | snapshot |
| parent | ae6f041d23a71073e447f50f01e5d9ec1ffb34bd | commit | diff |
| parent | 4aed4a7a08b80608c532d2da7eb7fe43c2945e13 | commit | diff |
Merge branch 'collectd-4.2' into collectd-4.3
Conflicts:
src/Makefile.am
Conflicts:
src/Makefile.am
| configure.in | diff1 | | diff2 | | blob | history |
| src/Makefile.am | diff1 | | diff2 | | blob | history |