![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Marc Fournier <marc.fournier@camptocamp.com> | |
| Wed, 14 Oct 2015 07:10:38 +0000 (09:10 +0200) | ||
| committer | Marc Fournier <marc.fournier@camptocamp.com> | |
| Wed, 14 Oct 2015 07:10:38 +0000 (09:10 +0200) | ||
| commit | c4da209d3b3ef23d03617c15abc3c8365c0ffd2b | |
| tree | 1e935e46d1f9eb32df837caedc0ffde0e09e5cf1 | tree | snapshot |
| parent | 159083153e62d7eabe46f8344439867130f1db80 | commit | diff |
| parent | 15eefc2d997debe27ac73cc46709fcb146f9b919 | commit | diff |
Merge branch 'collectd-5.4' into collectd-5.5
| src/python.c | diff1 | | diff2 | | blob | history |