Code

Merge branch 'ff/aggregate'
authorFlorian Forster <octo@collectd.org>
Sun, 11 Nov 2012 07:58:18 +0000 (08:58 +0100)
committerFlorian Forster <octo@collectd.org>
Sun, 11 Nov 2012 07:58:18 +0000 (08:58 +0100)
commitb22ffd9cb1938b4931d7628420a9f0b50461333f
tree759ef5cc489e6eb5707f60ffcc0714c56d9ef94f
parentc8f4401ac1b36bf34989c1d16431687203e35b1a
parentfde8b86f075b8829b196b489e0dc294ff888d6ed
Merge branch 'ff/aggregate'

Conflicts:
src/Makefile.am
configure.in
src/Makefile.am
src/collectd.conf.in
src/collectd.conf.pod
src/common.c