![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Florian Forster <octo@collectd.org> | |
| Mon, 8 Sep 2014 15:11:56 +0000 (17:11 +0200) | ||
| committer | Florian Forster <octo@collectd.org> | |
| Mon, 8 Sep 2014 15:11:56 +0000 (17:11 +0200) | ||
| commit | 67411e0794cfcab38e322b2ebbe2e5207cbdd86a | |
| tree | 141106b61e6d27ad86bc54f201feeef8fcb48e62 | tree | snapshot |
| parent | c0a9b7b38edf881e134f602b62990518a79bf191 | commit | diff |
| parent | be0a3a6eeb3655d5559abe768c4027889d1ae979 | commit | diff |
Merge remote-tracking branch 'github/master'