Merge branch 'collectd-5.1' into collectd-5.2
authorFlorian Forster <octo@collectd.org>
Mon, 14 Jan 2013 09:53:21 +0000 (10:53 +0100)
committerFlorian Forster <octo@collectd.org>
Mon, 14 Jan 2013 09:53:21 +0000 (10:53 +0100)
commitdefd9a4014a34640b1228bbcb96e6aa99e8bbb37
tree2f0af00e0a6f58b7e074e4120e363d4a8bbc8ff9
parent7ca030dea2fcb1f16516e988ab4bd1fcba0efe7b
parent3427c2e266c04d67848bda913caa730a395c7295
Merge branch 'collectd-5.1' into collectd-5.2
src/types.db