diff es/tour-merge-conflict.svg @ 771:b338f5490029

Americanize spellings :-(
author Bryan O'Sullivan <bos@serpentine.com>
date Thu, 09 Apr 2009 22:52:16 -0700
parents 04c08ad7e92e
children
line wrap: on
line diff