Code

Merge branch 'collectd-5.2'
authorFlorian Forster <octo@collectd.org>
Sat, 23 Mar 2013 09:13:02 +0000 (10:13 +0100)
committerFlorian Forster <octo@collectd.org>
Sat, 23 Mar 2013 09:13:02 +0000 (10:13 +0100)
commit632e1074beb71748f866087bcdf9b0ba1b1d2405
tree108624dc92921f77f2b811b94c5514d28a0b64e6
parent9de567ab3fd0725ce08f0581b6374518e1220e7e
parent21b429b6b5ecd2f9820d9a2516c12577a0e59d19
Merge branch 'collectd-5.2'

Conflicts:
configure.in
configure.in