Code

Merge branch 'sh/postgresql-writer'
authorFlorian Forster <octo@collectd.org>
Sat, 17 Nov 2012 08:39:33 +0000 (09:39 +0100)
committerFlorian Forster <octo@collectd.org>
Sat, 17 Nov 2012 08:39:33 +0000 (09:39 +0100)
commit5131a49ad0584aa22282aacf72b6e4ca75356bae
treeb96b8eaf7925130ae20ec01642323db0ae340bf2
parentd6d42818a8794a756727a6bb56e3680c7eefd6f9
parent9a84a669c98b90fad45d943b56d5d3f3b3ba8c97
Merge branch 'sh/postgresql-writer'

Conflicts:
src/collectd.conf.pod
src/postgresql.c
src/collectd.conf.pod
src/postgresql.c