70dc829 Fix multimaster bug: ensure timings are accurate and provide multi-master conflict resolution

Authored and Committed by lon 17 years ago
    Fix multimaster bug: ensure timings are accurate and provide multi-master conflict resolution
    
        
file modified
+15 -4
file modified
+29 -13
file modified
+1 -1