Code

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)
1  2 
AUTHORS
README
configure.in
src/Makefile.am
src/collectd.conf.in
src/collectd.conf.pod

diff --cc AUTHORS
Simple merge
diff --cc README
Simple merge
diff --cc configure.in
Simple merge
diff --cc src/Makefile.am
Simple merge
Simple merge
Simple merge