Merge branch 'collectd-5.1'
authorFlorian Forster <octo@collectd.org>
Thu, 11 Oct 2012 19:58:31 +0000 (21:58 +0200)
committerFlorian Forster <octo@collectd.org>
Thu, 11 Oct 2012 19:58:31 +0000 (21:58 +0200)
commit5eb71045f1d3b72b17e922a86b5014f68345b5b3
treeb9b92176c42ed0f4b3735a90e66d3b837a96837c
parent9f52d13ce92fa8d143f7f5824ea6be6ac6f8bd33
parent5fb8bff2b2d2d5c61621c6686b343d7e0eea48f0
Merge branch 'collectd-5.1'
configure.in
src/Makefile.am