pidgin: 667654b3: merge of '80eaa62b397424cadf9ea37ca0e988...

[rekkanoryo at pidgin.im]

-----------------------------------------------------------------
Revision: 667654b3309008b53bf4d9df02bd401d1ede8db5
Ancestor: 80eaa62b397424cadf9ea37ca0e98894f823fbf5
Ancestor: c2cd726c5225664720357cbe316631e320505431
Author: rekkanoryo at pidgin.im
Date: 2009-10-12T22:19:48
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/667654b3309008b53bf4d9df02bd401d1ede8db5

Modified files:
        ChangeLog libpurple/protocols/msn/contact.c
        libpurple/protocols/msn/notification.c
        libpurple/protocols/msn/user.c

ChangeLog: 

merge of '80eaa62b397424cadf9ea37ca0e98894f823fbf5'
     and 'c2cd726c5225664720357cbe316631e320505431'