annotate 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
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
355
a854990129c2 Taken search.ano (Atiti)
root <root@anonet2.nodomain>
parents:
diff changeset
1 Atiti