Merge branch 'master' into sr/pf
authorFlorian Forster <octo@collectd.org>
Thu, 13 Sep 2012 11:11:22 +0000 (13:11 +0200)
committerFlorian Forster <octo@collectd.org>
Thu, 13 Sep 2012 11:11:22 +0000 (13:11 +0200)
commit76a7816d2c066f2feff5c77e7da58df4dbc982c2
treec5d715f9b16a8276be4fb84835cbc946baabb8b6
parent6eca43522b65a3987c585231446dabb23f40ea22
parent5cf0dd212fd19be57c49fb3f4c073c5706a0fde0
Merge branch 'master' into sr/pf

Conflicts:
src/types.db
src/types.db