diff db/as/62487/owner @ 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 bab50350aeee a854990129c2
children 5cb640f441f9
line wrap: on
line diff
--- a/db/as/62487/owner	Tue Jan 11 22:15:42 2011 +0100
+++ b/db/as/62487/owner	Wed Jan 12 14:24:42 2011 +0100
@@ -1,1 +1,1 @@
-atiti
+Atiti