Merge branch 'ef/mic'
authorFlorian Forster <octo@collectd.org>
Tue, 21 May 2013 12:51:22 +0000 (14:51 +0200)
committerFlorian Forster <octo@collectd.org>
Tue, 21 May 2013 12:51:22 +0000 (14:51 +0200)
commit94a1816eb0fe9291ccfb966d15eb646e93086368
tree3deaa48d01a0a65b5de6e02e8d9a572fb4924f8c
parent2f39281928f7aab4e231852e01fe82149be28cff
parent580e0c479434434cef3661e02fb6af489714db5c
Merge branch 'ef/mic'
AUTHORS
README
configure.in
src/Makefile.am
src/collectd.conf.in
src/collectd.conf.pod