pidgin: fb0f52d5: merge of '50243dd37132d4ae636e94f587bf6a...

[darkrain42 at pidgin.im]

----------------------------------------------------------------------
Revision: fb0f52d501004e24bf6159f738670cc0ff9fcab4
Parent:   50243dd37132d4ae636e94f587bf6a41617ccd0d
Parent:   e6af6508a94951bfea63caba1fc4f85932cea3a3
Author:   darkrain42 at pidgin.im
Date:     01/12/11 09:32:20
Branch:   im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/fb0f52d501004e24bf6159f738670cc0ff9fcab4

Changelog: 

merge of '50243dd37132d4ae636e94f587bf6a41617ccd0d'
     and 'e6af6508a94951bfea63caba1fc4f85932cea3a3'

Changes against parent 50243dd37132d4ae636e94f587bf6a41617ccd0d

  patched  ChangeLog
  patched  libpurple/protocols/msn/msg.h
  patched  libpurple/protocols/msn/sbconn.c
  patched  libpurple/protocols/msn/slpmsg.c
  patched  libpurple/protocols/msn/slpmsg.h
  patched  libpurple/protocols/msn/slpmsg_part.c
  patched  po/de.po

Changes against parent e6af6508a94951bfea63caba1fc4f85932cea3a3

  patched  libpurple/protocols/jabber/bosh.c