merge brancj
authorjk <vacca@goto10.org>
Thu, 15 Oct 2009 14:41:40 +0000 (16:41 +0200)
committerjk <vacca@goto10.org>
Thu, 15 Oct 2009 14:41:40 +0000 (16:41 +0200)
commit2b44e24d8dc6bd80be99573b6736ac20a77fda6d
tree9fd44cca075c2a9088c8129dfc5d5964dec3d880
parent17f7d93b104afb15b6210286176e5107343e2c2e
parentef46667ab4647564bfa4ab5a71a7af44c379b939
merge brancj