Mercurial > pidgin.yaz
diff libpurple/protocols/yahoo/yahoo.c @ 20687:b1a42d258a14
explicit merge of '0b88f009442a340d4269c95605f580a9f444e767'
and 'cb13be33ceda2c587fec6fb3a86d8e777ca7194a'
to branch 'im.pidgin.pidgin'
author | Richard Laager <rlaager@wiktel.com> |
---|---|
date | Fri, 28 Sep 2007 17:01:20 +0000 |
parents | d6bcff4b4007 f379a2e9e939 |
children | f3cfcbbac3d8 3cc856ca2338 fdefa5eb46e2 b8d98bc09656 |