![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Florian Forster <octo@huhu.verplant.org> | |
| Thu, 13 Sep 2007 08:01:23 +0000 (10:01 +0200) | ||
| committer | Florian Forster <octo@huhu.verplant.org> | |
| Thu, 13 Sep 2007 08:01:23 +0000 (10:01 +0200) | ||
| commit | e6fc1600ee7bcde75c95db9b1f617caf78fc4c6a | |
| tree | 91a546b026ab6a13b4c2b46f67d06ebda716336a | tree | snapshot |
| parent | 97deb523823b1f04880d584a19bc2b0e7e10d96a | commit | diff |
| parent | 6e84354ee29495e07bce5884fa4c7f15cd5b7d4e | commit | diff |
Merge branch 'collectd-4.0' into collectd-4.1
Conflicts:
ChangeLog
Conflicts:
ChangeLog
| ChangeLog | diff1 | | diff2 | | blob | history |
| src/apcups.c | diff1 | | diff2 | | blob | history |