diff libpurple/protocols/msn/contact.c @ 21098:7e200a629109

explicit merge of '8f24e3576448fefbc861e06f1e8d5fe17db2e71a' and '49d0219884ede2c6c571f2df73e29dffa86f54ad'
author Richard Laager <rlaager@wiktel.com>
date Sun, 14 Oct 2007 02:13:14 +0000
parents cfaf74ec93dc
children bbcc9e206c43 c8f99cb61dc9 dead11aac1bc
line wrap: on
line diff