![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Florian Forster <octo@collectd.org> | |
| Sat, 17 Nov 2012 08:39:33 +0000 (09:39 +0100) | ||
| committer | Florian Forster <octo@collectd.org> | |
| Sat, 17 Nov 2012 08:39:33 +0000 (09:39 +0100) | ||
| commit | 5131a49ad0584aa22282aacf72b6e4ca75356bae | |
| tree | b96b8eaf7925130ae20ec01642323db0ae340bf2 | tree | snapshot |
| parent | d6d42818a8794a756727a6bb56e3680c7eefd6f9 | commit | diff |
| parent | 9a84a669c98b90fad45d943b56d5d3f3b3ba8c97 | commit | diff |
Merge branch 'sh/postgresql-writer'
Conflicts:
src/collectd.conf.pod
src/postgresql.c
Conflicts:
src/collectd.conf.pod
src/postgresql.c
| src/collectd.conf.pod | diff1 | | diff2 | | blob | history |
| src/postgresql.c | diff1 | | diff2 | | blob | history |