Mercurial > hg > anonet-resdb
changeset 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 (current diff) 2f379a0b6461 (diff) |
children | e70f56fcb80b |
files | db/as/62487/owner |
diffstat | 3 files changed, 3 insertions(+), 3 deletions(-) [+] |
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