Code

Merge branch 'collectd-5.3'
authorFlorian Forster <octo@collectd.org>
Sat, 13 Jul 2013 09:24:27 +0000 (11:24 +0200)
committerFlorian Forster <octo@collectd.org>
Sat, 13 Jul 2013 09:24:27 +0000 (11:24 +0200)
commit10b92353ea2ccf66eabad273799c36225d2efc3f
tree35c5d1286c6fe63e23de643edf2d7bb3e38b0979
parent38d06a8f868293466f4eee943555c65457a5e560
parenta320c4a23fee0e900a7cd2310c771b8dbd2a2d82
Merge branch 'collectd-5.3'

Conflicts:
src/plugin.c
src/plugin.c
src/write_graphite.c