![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Florian Forster <octo@leeloo.lan.home.verplant.org> | |
| Sat, 15 Sep 2007 09:01:19 +0000 (11:01 +0200) | ||
| committer | Florian Forster <octo@leeloo.lan.home.verplant.org> | |
| Sat, 15 Sep 2007 09:01:19 +0000 (11:01 +0200) | ||
| commit | 7e5df1a2c6611bd4ac9fb8ac4b78106f9139ae6e | |
| tree | 8d2bf2a135288ff0b66f7c488ff4bc8a2d81ad86 | tree | snapshot |
| parent | f709381fdef43b1857ffb72c2a2721b2a75ecd71 | commit | diff |
| parent | 8cc583bb44d46a2333b92d8ff4619fce2de5f30f | commit | diff |
Merge branch 'collectd-3.11' into collectd-4.0
Conflicts:
src/apcups.c
nothing added to commit but untracked files present (use "git add" to track)
Conflicts:
src/apcups.c
nothing added to commit but untracked files present (use "git add" to track)