Timeout merge complete
commit37e977c3fee75f7b6bf9bc30f1ac12c58c864622
authorGraham Cobb <Graham Cobb@53f5c7ee-bee3-0310-bbc5-ea0e15fffd5e>
Tue, 3 Feb 2009 19:54:04 +0000 (3 19:54 +0000)
committerGraham Cobb <Graham Cobb@53f5c7ee-bee3-0310-bbc5-ea0e15fffd5e>
Tue, 3 Feb 2009 19:54:04 +0000 (3 19:54 +0000)
tree5f23b0326bc33404e0bd69d4b46c4adcf36be611
parentc047cec9c6332294342a9b96b47826438387ea42
Timeout merge complete

This commit is just to tidy up attributes

git-svn-id: https://svn.opensync.org/trunk/trunk@5258 53f5c7ee-bee3-0310-bbc5-ea0e15fffd5e