Code

Merge branch 'ff/java' of /var/lib/git/collectd into ff/java
authorFlorian Forster <octo@huhu.verplant.org>
Fri, 20 Feb 2009 10:13:38 +0000 (11:13 +0100)
committerFlorian Forster <octo@huhu.verplant.org>
Fri, 20 Feb 2009 10:13:38 +0000 (11:13 +0100)
commitb2bf65d02a4c5d35e1d01f2e2f0e1dc2a1b3995b
tree3dd27628950ba024dc0d877ce23a50eea1daa518
parentec842e40fbae1bb22e90a65dfcfab16eca3fc316
parent48b597ad215f915dfc6d7c5d4152b1dfd16c199f
Merge branch 'ff/java' of /var/lib/git/collectd into ff/java