![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Florian Forster <octo@collectd.org> | |
| Mon, 14 Jan 2013 09:53:29 +0000 (10:53 +0100) | ||
| committer | Florian Forster <octo@collectd.org> | |
| Mon, 14 Jan 2013 09:53:29 +0000 (10:53 +0100) | ||
| commit | 33e60ef35f745c56b1a5936272b1dd8b0cf63d12 | |
| tree | 1336e363f04132c9bf405e6970e2b504c896859e | tree | snapshot |
| parent | 1633a3ea44885c3d09f2b43f26956adee2fbb4a4 | commit | diff |
| parent | defd9a4014a34640b1228bbcb96e6aa99e8bbb37 | commit | diff |
Merge branch 'collectd-5.2'
| src/apcups.c | diff1 | | diff2 | | blob | history |
| src/collectd.conf.in | diff1 | | diff2 | | blob | history |
| src/collectd.conf.pod | diff1 | | diff2 | | blob | history |