Merge branch 'ff/netlib' into ja/zeromq
authorFlorian Forster <octo@leeloo.lan.home.verplant.org>
Sat, 6 Nov 2010 11:15:52 +0000 (12:15 +0100)
committerFlorian Forster <octo@leeloo.lan.home.verplant.org>
Sat, 6 Nov 2010 11:15:52 +0000 (12:15 +0100)
commit0b430c62307f429de02f814c0966946fdef36259
tree7785e4fd856acd808e799ac66502fb2fec80490f
parentb46550e9b0bfa67824e0fa30e8d8cbc1efa5cedd
parentda69316b56551acab689af78809ec88d48a601cd
Merge branch 'ff/netlib' into ja/zeromq
configure.in
src/Makefile.am
src/collectd.conf.in
src/collectd.conf.pod