pidgin: c2566d6b: merge of '2cc4b9096219b80544460c7419be08...

[darkrain42 at pidgin.im]

-----------------------------------------------------------------
Revision: c2566d6bf8ee351a2b7a0a849775fd5bc7972132
Ancestor: 2cc4b9096219b80544460c7419be088836ee4705
Ancestor: 990fb79f4d87ff08cfe2a68db0da873a1b63a4c4
Author: darkrain42 at pidgin.im
Date: 2009-05-03T06:45:46
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/c2566d6bf8ee351a2b7a0a849775fd5bc7972132

Modified files:
        libpurple/protocols/jabber/caps.c
        libpurple/protocols/jabber/pep.c
        libpurple/protocols/jabber/useravatar.c
        libpurple/protocols/jabber/usernick.c
        libpurple/protocols/msnp9/slplink.c

ChangeLog: 

merge of '2cc4b9096219b80544460c7419be088836ee4705'
     and '990fb79f4d87ff08cfe2a68db0da873a1b63a4c4'