Code

Merge branch 'collectd-5.2'
authorFlorian Forster <octo@collectd.org>
Sat, 16 Mar 2013 12:44:01 +0000 (13:44 +0100)
committerFlorian Forster <octo@collectd.org>
Sat, 16 Mar 2013 12:44:01 +0000 (13:44 +0100)
commit7285e5f59ffa4efb391485fe9b35ee02f3dc856f
treeca0beb8cc82b2651536c207306ffd94d3a94c17e
parentb48fe5c7fc811271d0a3a1f86ec21054191c0878
parent3b51243382501d5f3cdda79d30c7ecf39d22dd87
Merge branch 'collectd-5.2'

Conflicts:
src/plugin.c
src/Makefile.am