diff contrib/simplemerge @ 10799:fa7a14277cef

Merge with stable
author Martin Geisler <mg@lazybytes.net>
date Thu, 01 Apr 2010 00:15:29 +0200
parents bb9f13974d8e
children 659f34b833b9
line wrap: on
line diff