![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Ruben Kerkhof <ruben@rubenkerkhof.com> | |
| Fri, 10 Jun 2016 07:47:53 +0000 (09:47 +0200) | ||
| committer | Ruben Kerkhof <ruben@rubenkerkhof.com> | |
| Fri, 10 Jun 2016 07:47:53 +0000 (09:47 +0200) | ||
| commit | 65c20e41cfad6e7ab024983f561835fd347124ce | |
| tree | 5657d62fe8b95ee29975a42370de9e584526d84a | tree | snapshot |
| parent | 22651d8d4dc49e24bbac2cd34e0642dcf3639c97 | commit | diff |
| parent | 21602dea4a6ac2a9003c2f2b0aa4c87ce5e475bf | commit | diff |
Merge branch 'collectd-5.4' into collectd-5.5