comparison .mtn-ignore @ 29897:51b8ca70570d

merge of '2946037e3974559877f516df2006883ad5846e19' and '4d76e5a5a0215750f9dd480089f7f00db76d2903'
author Ethan Blanton <elb@pidgin.im>
date Tue, 11 May 2010 02:00:24 +0000
parents ac012def9488
children 88a4a5a0fafa
comparison
equal deleted inserted replaced
29896:cb9afb16cc3d 29897:51b8ca70570d