Author: seanbright Revision: 168378 Modified property: svn:log Modified: svn:log at Sat Jan 10 09:50:41 2009 ------------------------------------------------------------------------------ --- svn:log (original) +++ svn:log Sat Jan 10 09:50:41 2009 @@ -1,0 +1,1 @@ +Bring back up to date and renable automerge.