comparison .mtn-ignore @ 30502:92767d9eac2e

merge of '4f95778269e5a6f5dc65dc999e28f67e5604b35a' and 'fb76a1cdbe11d4297b67af0a12356362323f60c5'
author Elliott Sales de Andrade <qulogic@pidgin.im>
date Fri, 21 May 2010 21:57:18 +0000
parents 88a4a5a0fafa
children 1deda5d6733b
comparison
equal deleted inserted replaced
30501:ee423c6c71b6 30502:92767d9eac2e