Merge branch 'collectd-4.10' into collectd-5.0
authorFlorian Forster <octo@collectd.org>
Sun, 11 Nov 2012 11:05:17 +0000 (12:05 +0100)
committerFlorian Forster <octo@collectd.org>
Sun, 11 Nov 2012 11:05:17 +0000 (12:05 +0100)
commit9e7b3a035836474cb4af253b248de30d5eb97f4d
treeb576fd5f136570e697266a5afff4da4a828c2f8c
parent400596160704146845940d7d9c4f794c0d2ddc03
parent96bcc6a8ec704702462784de938674f7e5a03e2f
Merge branch 'collectd-4.10' into collectd-5.0

Conflicts:
ChangeLog
src/pyvalues.c
version-gen.sh
ChangeLog
configure.in
src/Makefile.am
src/netlink.c
src/network.c
src/python.c
src/pyvalues.c