pidgin: 311b4db5: merge of '54ee2acb5f6ef92c29503315eb7c24...

[markdoliner at pidgin.im]

-----------------------------------------------------------------
Revision: 311b4db51b575e1baa7f78d751ff926475edecc3
Ancestor: 54ee2acb5f6ef92c29503315eb7c24bae221cd7b
Ancestor: 6f0bf9d5a17857431bb0efc78f6d591e25772ddd
Author: markdoliner at pidgin.im
Date: 2008-11-13T09:00:45
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/311b4db51b575e1baa7f78d751ff926475edecc3

Modified files:
        COPYRIGHT ChangeLog libpurple/protocols/msn/slp.c
        libpurple/protocols/msn/slpcall.c
        libpurple/protocols/msn/slplink.c
        libpurple/protocols/msn/slplink.h
        libpurple/protocols/yahoo/yahoo.c
        libpurple/protocols/yahoo/yahoo.h

ChangeLog: 

merge of '54ee2acb5f6ef92c29503315eb7c24bae221cd7b'
     and '6f0bf9d5a17857431bb0efc78f6d591e25772ddd'