Code

Merge branch 'collectd-4.6' into collectd-4.7
authorFlorian Forster <octo@huhu.verplant.org>
Wed, 15 Jul 2009 09:10:19 +0000 (11:10 +0200)
committerFlorian Forster <octo@huhu.verplant.org>
Wed, 15 Jul 2009 09:10:19 +0000 (11:10 +0200)
commit307459f5a1d79ee373cf59c7c8a0824d325c43e3
tree170a6c28771c974a455c6d83f06275d01a14ce32
parentb3bfb951c73ea3d232e0e97a42479a5e3310125d
parentd2c40f1d7bea102065733d30bba4c9b30db23ab7
Merge branch 'collectd-4.6' into collectd-4.7

Conflicts:

src/memcached.c
src/configfile.c
src/memcached.c
version-gen.sh