Merge branch 'ad/aquaero'
authorFlorian Forster <octo@collectd.org>
Sun, 18 Aug 2013 09:13:32 +0000 (11:13 +0200)
committerFlorian Forster <octo@collectd.org>
Sun, 18 Aug 2013 09:13:32 +0000 (11:13 +0200)
commitbdf4ac4bba349bac128fea28fac13fda784ae78c
tree9e4177b873379e1e93c6f9e8de72f660e7858bbf
parent8df4f1b9b3a47e75673b410b968aa4e35144cb14
parent4b4d7f3060c116e8f4fdb605c037a281a95de72f
Merge branch 'ad/aquaero'
AUTHORS
README
configure.in
src/Makefile.am
src/collectd.conf.in
src/collectd.conf.pod