![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Florian Forster <ff@octo.it> | |
| Wed, 23 Jun 2010 08:33:44 +0000 (10:33 +0200) | ||
| committer | Florian Forster <octo@leeloo.lan.home.verplant.org> | |
| Wed, 23 Jun 2010 08:33:44 +0000 (10:33 +0200) | ||
| commit | aaf63df27b244028582cfd078e82189110501043 | |
| tree | ccd153d3468e5415ec77f2f2e79a10497372b453 | tree | snapshot |
| parent | 80251c6dadb946e41864d75df9af767873514361 | commit | diff |
| parent | 417610268a16cb4b84d79bf449b1f70142791676 | commit | diff |
Merge branch 'master' of verplant.org:/var/lib/git/collection4