![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Marc Fournier <marc.fournier@camptocamp.com> | |
| Wed, 8 Jan 2014 17:24:27 +0000 (18:24 +0100) | ||
| committer | Marc Fournier <marc.fournier@camptocamp.com> | |
| Wed, 8 Jan 2014 17:24:27 +0000 (18:24 +0100) | ||
| commit | affac33e83584e7538c358e3bd0a587d0c692bc3 | |
| tree | 334f969c7c2ba0adabfbc2c1f4606cfc6a37ead8 | tree | snapshot |
| parent | 8e9bdd5a63e67c6adb403c2aac4a25e0595ea147 | commit | diff |
| parent | cde09b547abbeb7595d91259fcc628504d0f55a9 | commit | diff |
Merge branch 'collectd-4.10' into collectd-5.3
| src/curl_xml.c | diff1 | | diff2 | | blob | history |
| src/interface.c | diff1 | | diff2 | | blob | history |