Merge branch 'master' into ff/java
authorFlorian Forster <octo@leeloo.lan.home.verplant.org>
Sun, 22 Feb 2009 18:50:14 +0000 (19:50 +0100)
committerFlorian Forster <octo@leeloo.lan.home.verplant.org>
Sun, 22 Feb 2009 18:50:14 +0000 (19:50 +0100)
commit04b395325b152a5ddf424d1a750f455a2f8229fb
tree32e8f9e275d881895ae895a55f660f5f55dc269b
parentd3733caf0686008ac5130e2f81fa30d60993c63c
parentf413a3a8faa8e65cf79d45b2b518add78612e75c
Merge branch 'master' into ff/java
configure.in
src/Makefile.am
src/collectd.conf.pod
src/perl.c