![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Ruben Kerkhof <ruben@rubenkerkhof.com> | |
| Fri, 15 Apr 2016 19:03:46 +0000 (21:03 +0200) | ||
| committer | Ruben Kerkhof <ruben@rubenkerkhof.com> | |
| Fri, 15 Apr 2016 19:03:46 +0000 (21:03 +0200) | ||
| commit | 213eb227d7737bfbd899474033f94342c61dcb8c | |
| tree | e486e1faba81f2b39b91e25717c38e11a8982df6 | tree | snapshot |
| parent | c346dc6b18ee4215ccab911c1732c5c39a961baf | commit | diff |
| parent | 5b1caeeadcecd798ee4b386b15c17cb7591a8bfe | commit | diff |
Merge branch 'collectd-5.4' into collectd-5.5
| src/curl.c | diff1 | | diff2 | | blob | history |
| src/curl_json.c | diff1 | | diff2 | | blob | history |
| src/curl_xml.c | diff1 | | diff2 | | blob | history |