comparison libpurple/protocols/msn/object.c @ 27967:e1cd44c7c7af

explicit merge of 'd957c051e839d63bfc0ef71320934890e7ae63c4' and '7fbd51e5a790f5cf3275a0bb8a8198acd078b4ec'
author Yoshiki Yazawa <yaz@honeyplanet.jp>
date Sat, 25 Jul 2009 04:54:36 +0000
parents 5cdd93dac7a2
children f1437342cc0e
comparison
equal deleted inserted replaced
27966:b4daae0798e3 27967:e1cd44c7c7af