diff git-commit @ 358:f316fd5e13bf draft

Merge branch 'master' of git://git1.somerandomnick.ano Conflicts: db/as/62487/owner
author Ivo Smits <Ivo@UCIS.nl>
date Wed, 12 Jan 2011 14:24:42 +0100
parents de3f72314ca4
children 48b9f0dd8f5b
line wrap: on
line diff