Merge branch 'collectd-4.5' into collectd-4.6
authorFlorian Forster <octo@leeloo.lan.home.verplant.org>
Sat, 2 May 2009 08:50:56 +0000 (10:50 +0200)
committerFlorian Forster <octo@leeloo.lan.home.verplant.org>
Sat, 2 May 2009 08:50:56 +0000 (10:50 +0200)
commitde0fdb208de123fe753c5fcf03533833777a5b4a
tree71f124e49063b54e95a80aa6675854b79d03c9a7
parent52f41fed6e32f66f5817a82ae175fd443084f8a3
parent2928de22ab136c8b07e1204db4128dc1aeeaff01
Merge branch 'collectd-4.5' into collectd-4.6
src/email.c
src/memory.c
src/processes.c