diff .hgrc @ 109:e83b7dd50461

merge commit
author Jeff Hammel <jhammel@mozilla.com>
date Mon, 29 Nov 2010 08:34:29 -0800
parents c4126b9a185f
children 2a83052a7a50
line wrap: on
line diff