![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Claudius Zingerli <gitmail@zeuz.ch> | |
| Thu, 21 Jan 2016 16:46:50 +0000 (17:46 +0100) | ||
| committer | Claudius Zingerli <gitmail@zeuz.ch> | |
| Thu, 21 Jan 2016 16:46:50 +0000 (17:46 +0100) | ||
| commit | 90b186315b766c10bacd2f5171b3d05f65280da5 | |
| tree | dda9d07bbb515e063a6fe565b05588d495d55745 | tree | snapshot |
| parent | d8f6c4d40e4f19be0cfac41593f44b75685f3f0b | commit | diff |
| parent | e6fa7293d20e9f987dd36a7de76436c6c79c240b | commit | diff |
Merge branch 'master' of git.edu-zg.ch:zeuz/collectd