Merge branch 'collectd-5.1' into collectd-5.2
authorFlorian Forster <octo@collectd.org>
Tue, 9 Apr 2013 00:55:06 +0000 (17:55 -0700)
committerFlorian Forster <octo@collectd.org>
Tue, 9 Apr 2013 00:55:06 +0000 (17:55 -0700)
commit7d5c193fce64d04cee72619c0b54d624d5011e35
tree1791422447cf122e6889ba023637020a1d24ba1c
parent842c1a2d2a640151a89b9de7f4acd3b6a058c799
parent3b168699841135aa3e6d02eec0eb548cba8880d5
Merge branch 'collectd-5.1' into collectd-5.2

Conflicts:
ChangeLog
version-gen.sh
ChangeLog