![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Marc Fournier <marc.fournier@camptocamp.com> | |
| Thu, 28 May 2015 18:21:55 +0000 (20:21 +0200) | ||
| committer | Marc Fournier <marc.fournier@camptocamp.com> | |
| Thu, 28 May 2015 18:21:55 +0000 (20:21 +0200) | ||
| commit | 9b43c4ca7442e7886c1fbe339ce57f297872269f | |
| tree | 274d1579db2ea3bbc9526433255777f2692c7c8d | tree | snapshot |
| parent | 35dfbf6616169e6f0fddb2edd0ccb53b6a753da7 | commit | diff |
| parent | 04c96b0c99584b1bc66383f5fdbe9ca3ce2d226e | commit | diff |
Merge remote-tracking branch 'origin/collectd-5.3' into collectd-5.4