pidgin: d11be8f4: merge of '84e4c2078413eedc9eaea26df534ec...

[darkrain42 at pidgin.im]

----------------------------------------------------------------------
Revision: d11be8f4847a7fa0b26ef5525b92f7f2339a7f19
Parent:   84e4c2078413eedc9eaea26df534ecca59425b69
Parent:   f23ff84c6d73ce743343a1f0547b7e0dba692407
Author:   darkrain42 at pidgin.im
Date:     02/15/11 10:49:58
Branch:   im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/d11be8f4847a7fa0b26ef5525b92f7f2339a7f19

Changelog: 

merge of '84e4c2078413eedc9eaea26df534ecca59425b69'
     and 'f23ff84c6d73ce743343a1f0547b7e0dba692407'

Changes against parent 84e4c2078413eedc9eaea26df534ecca59425b69

  patched  libpurple/protocols/jabber/bosh.c

Changes against parent f23ff84c6d73ce743343a1f0547b7e0dba692407

  patched  libpurple/protocols/msn/msn.c
  patched  libpurple/protocols/msn/msn.h
  patched  libpurple/protocols/msn/notification.c
  patched  libpurple/protocols/msn/state.c
  patched  libpurple/protocols/msn/user.h