pidgin: 9cce7522: merge of '156e8a2f721f092d3fd2044315094a...

[markdoliner at pidgin.im]

-----------------------------------------------------------------
Revision: 9cce7522e5d3182c075715ac5d4ec375672cd1b0
Ancestor: 156e8a2f721f092d3fd2044315094a886b637ecd
Ancestor: 76b9820ced8976f78942e239a553ed008b0551bc
Author: markdoliner at pidgin.im
Date: 2009-08-13T02:24:55
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/9cce7522e5d3182c075715ac5d4ec375672cd1b0

Modified files:
        libpurple/protocols/msn/cmdproc.c
        libpurple/protocols/msn/directconn.c
        libpurple/protocols/msn/session.h
        libpurple/protocols/msn/slpmsg.h
        libpurple/protocols/msn/sync.h
        libpurple/protocols/msn/userlist.h pidgin/gtkdialogs.c
        po/ChangeLog po/ro.po

ChangeLog: 

merge of '156e8a2f721f092d3fd2044315094a886b637ecd'
     and '76b9820ced8976f78942e239a553ed008b0551bc'