![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Florian Forster <octo@collectd.org> | |
| Fri, 19 Jun 2015 18:08:24 +0000 (20:08 +0200) | ||
| committer | Florian Forster <octo@collectd.org> | |
| Fri, 19 Jun 2015 18:08:24 +0000 (20:08 +0200) | ||
| commit | 72a8fd43dcf55cbc9a65a5530c232322c0d686af | |
| tree | c27d1be67ee9f6f624a927ee1db85a49ac103873 | tree | snapshot |
| parent | 6d8c3791a98eda82702ece14dbda46bc5f3de928 | commit | diff |
| parent | 18dc4a803e23dbd8448cf808d9a579dadf581843 | commit | diff |
Merge branch 'collectd-5.5'