Mercurial > pidgin
diff libpurple/protocols/yahoo/yahoo_friend.c @ 31604:2f66104dab0c
merge of '28fe114c65c7f5fa3fdc6a89311c370b76a1c371'
and 'cc913e6ec579f0d81db827c23a13146779b9ca3c'
author | Ka-Hing Cheung <khc@hxbc.us> |
---|---|
date | Thu, 12 May 2011 02:31:25 +0000 |
parents | a8cc50c2279f |
children | fcf841ffd620 |