annotate db/usr/d3v1150m471c/git @ 952:b8ad676b3c0c draft

Merge commit '40af6cb0b04cc5c938fc0212d8b9bbc91bedc716'
author Nick <nick@somerandomnick.ano>
date Thu, 14 Jun 2012 17:32:50 +0000
parents f5ec84b7d825
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
583
f5ec84b7d825 restored old resdb from srn and added new changes for tinydns, my git domain, and peer2anonet
d3v11 <d3v11@d3v11.ano>
parents: 529
diff changeset
1 git://git.d3v11.ano/