Merge branch 'sh/postgres-queries'
authorFlorian Forster <octo@collectd.org>
Sat, 17 Nov 2012 08:28:39 +0000 (09:28 +0100)
committerFlorian Forster <octo@collectd.org>
Sat, 17 Nov 2012 08:28:39 +0000 (09:28 +0100)
1  2 
src/collectd.conf.pod

Simple merge