repo: resdb
action: commit
revision: 
path_from: 
revision_from: 303adb66a2ac12428a90362187ba7ba6f6822333:
path_to: 
revision_to:
git.thebackupbox.net
resdb
git clone git://git.thebackupbox.net/resdb
commit 303adb66a2ac12428a90362187ba7ba6f6822333
Merge: 38fdf66 3ab900b
Author: Nick 
Date:   Tue Oct 26 23:12:03 2010 +0000

    Merge git://1.0.49.10

    Conflicts:
            doc/www.anonet2.org/public_pod/index.pod

-----END OF PAGE-----