[geeklog-cvs] geeklog: Merging branches *sigh*

[geeklog-cvs at lists.geeklog.net]

details:   http://project.geeklog.net/cgi-bin/hgweb.cgi/rev/31c3b9a47121
changeset: 7143:31c3b9a47121
user:      Dirk Haun <dirk at haun-online.de>
date:      Sun Jun 21 20:48:37 2009 +0200
description:
Merging branches *sigh*