Code

Merge branch 'sh/config-include'
authorFlorian Forster <octo@collectd.org>
Wed, 28 Nov 2012 09:16:26 +0000 (10:16 +0100)
committerFlorian Forster <octo@collectd.org>
Wed, 28 Nov 2012 09:16:26 +0000 (10:16 +0100)
commit6a8d29a816f8a1a6b2a1c82d5c33ceba8d006f25
treec1daeeaa14da5e192f1dce1e62855361be6001a3
parentc7d2dc3967ca49886f2869d9a5dc8ce40a3b126e
parentd641c344c11fd30abe9faab5668152f2e413f1b9
Merge branch 'sh/config-include'
src/collectd.conf.pod