projects / collectd.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: c257598 e14c044)
Merge remote-tracking branch 'github-tokkee/sh/postgresql'
authorFlorian Forster <octo@collectd.org>
Tue, 29 Jan 2013 09:24:52 +0000 (10:24 +0100)
committerFlorian Forster <octo@collectd.org>
Tue, 29 Jan 2013 09:24:52 +0000 (10:24 +0100)

Trivial merge
collectd, the system statistics collection daemon