Code

Merge branch 'collectd-5.0' into collectd-5.1
authorFlorian Forster <octo@collectd.org>
Sun, 11 Nov 2012 11:43:52 +0000 (12:43 +0100)
committerFlorian Forster <octo@collectd.org>
Sun, 11 Nov 2012 11:43:52 +0000 (12:43 +0100)
commit1d7439282ad415e7d1630598becae3109c7d2735
treec121a118aef6c30e5739bc30f9c6532f095d36e0
parent642bde1ec7306e5dc0fed28fda72807f2d97a3fd
parent494386dffbab10af47c08846e6e3fec2b2ae5107
Merge branch 'collectd-5.0' into collectd-5.1

Conflicts:
ChangeLog
version-gen.sh
ChangeLog
configure.in
src/Makefile.am