![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Marc Fournier <marc.fournier@camptocamp.com> | |
| Wed, 8 Apr 2015 22:32:50 +0000 (00:32 +0200) | ||
| committer | Marc Fournier <marc.fournier@camptocamp.com> | |
| Wed, 8 Apr 2015 22:32:50 +0000 (00:32 +0200) | ||
| commit | cfe801cf0236ea2fade924e0f2b5ce3d1a51698a | |
| tree | 791fa7a2499a2332d17437cd828f52a200dc1e1f | tree | snapshot |
| parent | 52b5def4017f552f02eb3ca5716c4ee9d7a43145 | commit | diff |
| parent | 42af0f20eb918019564eeae3339f94cea7e49834 | commit | diff |
Merge remote-tracking branch 'origin/pr/925'
| README | diff1 | | diff2 | | blob | history |
| configure.ac | diff1 | | diff2 | | blob | history |
| src/Makefile.am | diff1 | | diff2 | | blob | history |
| src/collectd.conf.in | diff1 | | diff2 | | blob | history |
| src/collectd.conf.pod | diff1 | | diff2 | | blob | history |
| src/types.db | diff1 | | diff2 | | blob | history |