Merge branch 'yaccz/curl-status'
authorFlorian Forster <octo@collectd.org>
Sun, 26 May 2013 15:35:17 +0000 (17:35 +0200)
committerFlorian Forster <octo@collectd.org>
Sun, 26 May 2013 15:35:17 +0000 (17:35 +0200)
1  2 
src/types.db

diff --cc src/types.db
Simple merge