![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Marc Fournier <marc.fournier@camptocamp.com> | |
| Fri, 6 Nov 2015 08:40:56 +0000 (09:40 +0100) | ||
| committer | Marc Fournier <marc.fournier@camptocamp.com> | |
| Fri, 6 Nov 2015 08:40:56 +0000 (09:40 +0100) | ||
| commit | 142fb2ea490118e62f34df41f907ef1e58fb0be4 | |
| tree | 26aad3bac99e2b2da65a9d197d78aceab578e9b1 | tree | snapshot |
| parent | b7de71b32b11645957e210ebadc86ca6cd84041f | commit | diff |
| parent | 644ce4666c420832fc76d219784d4e698d26829d | commit | diff |
Merge branch 'collectd-5.4' into collectd-5.5
| src/apcups.c | diff1 | | diff2 | | blob | history |