![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Florian Forster <octo@huhu.verplant.org> | |
| Fri, 20 Feb 2009 10:13:38 +0000 (11:13 +0100) | ||
| committer | Florian Forster <octo@huhu.verplant.org> | |
| Fri, 20 Feb 2009 10:13:38 +0000 (11:13 +0100) | ||
| commit | b2bf65d02a4c5d35e1d01f2e2f0e1dc2a1b3995b | |
| tree | 3dd27628950ba024dc0d877ce23a50eea1daa518 | tree | snapshot |
| parent | ec842e40fbae1bb22e90a65dfcfab16eca3fc316 | commit | diff |
| parent | 48b597ad215f915dfc6d7c5d4152b1dfd16c199f | commit | diff |
Merge branch 'ff/java' of /var/lib/git/collectd into ff/java