pidgin: 80eaa62b: merge of '466c48e634f92dbe476c9d7504ef7e...

[rekkanoryo at pidgin.im]

-----------------------------------------------------------------
Revision: 80eaa62b397424cadf9ea37ca0e98894f823fbf5
Ancestor: 466c48e634f92dbe476c9d7504ef7eb91a4b304e
Ancestor: 9afa0cfda64ff9907b43b21fe64f17f698d2aa0d
Author: rekkanoryo at pidgin.im
Date: 2009-10-12T19:54:27
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/80eaa62b397424cadf9ea37ca0e98894f823fbf5

Modified files:
        ChangeLog libpurple/protocols/jabber/buddy.c
        libpurple/protocols/jabber/chat.c
        libpurple/protocols/jabber/chat.h
        libpurple/protocols/jabber/google.c
        libpurple/protocols/jabber/google.h
        libpurple/protocols/msn/contact.c
        libpurple/protocols/msn/notification.c
        libpurple/protocols/msn/user.c

ChangeLog: 

merge of '466c48e634f92dbe476c9d7504ef7eb91a4b304e'
     and '9afa0cfda64ff9907b43b21fe64f17f698d2aa0d'