pidgin: 14f8b460: merge of '04cb3481a7947425a89254b98d0d64...

[datallah at pidgin.im]

-----------------------------------------------------------------
Revision: 14f8b4609456592014383ef4957124a07f57ac3a
Ancestor: 04cb3481a7947425a89254b98d0d64b73ca36dc1
Ancestor: e62b4e504b56e4f3909ef285bda4d55dfb7504bf
Author: datallah at pidgin.im
Date: 2008-08-09T02:24:55
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/14f8b4609456592014383ef4957124a07f57ac3a

Modified files:
        libpurple/certificate.c libpurple/protocols/jabber/buddy.c
        libpurple/protocols/jabber/jabber.c
        libpurple/protocols/jabber/jabber.h
        libpurple/protocols/msn/msn.c

ChangeLog: 

merge of '04cb3481a7947425a89254b98d0d64b73ca36dc1'
     and 'e62b4e504b56e4f3909ef285bda4d55dfb7504bf'