log src/ChangeLog @ 5459:413bf5efaedb

age author description
Sun, 24 Apr 2011 00:15:47 +0900 Stephen J. Turnbull Remove leftover conflict markers.
Fri, 14 Jan 2011 23:16:18 +0100 Mats Lidell Merge with trunk.