Code

Merge branch 'collectd-5.2'
authorFlorian Forster <octo@collectd.org>
Mon, 14 Jan 2013 09:53:29 +0000 (10:53 +0100)
committerFlorian Forster <octo@collectd.org>
Mon, 14 Jan 2013 09:53:29 +0000 (10:53 +0100)
commit33e60ef35f745c56b1a5936272b1dd8b0cf63d12
tree1336e363f04132c9bf405e6970e2b504c896859e
parent1633a3ea44885c3d09f2b43f26956adee2fbb4a4
parentdefd9a4014a34640b1228bbcb96e6aa99e8bbb37
Merge branch 'collectd-5.2'
src/apcups.c
src/collectd.conf.in
src/collectd.conf.pod