pidgin: 57e32abb: merge of 'a7d49884941697519567616ac54f4c...

[qulogic at pidgin.im]

----------------------------------------------------------------------
Revision: 57e32abb12a78079affb4d057471b9881ef93f65
Parent:   a7d49884941697519567616ac54f4c2884df05e2
Parent:   e15c002b6cf19a3cf1843b35457ff8b1efa78a5a
Author:   qulogic at pidgin.im
Date:     07/31/10 19:43:39
Branch:   im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/57e32abb12a78079affb4d057471b9881ef93f65

Changelog: 

merge of 'a7d49884941697519567616ac54f4c2884df05e2'
     and 'e15c002b6cf19a3cf1843b35457ff8b1efa78a5a'

Changes against parent a7d49884941697519567616ac54f4c2884df05e2

  patched  ChangeLog
  patched  libpurple/protocols/msn/msn.c
  patched  libpurple/protocols/msn/object.c
  patched  libpurple/protocols/msn/object.h
  patched  libpurple/protocols/msn/session.c
  patched  libpurple/protocols/msn/session.h
  patched  libpurple/protocols/msn/slp.c
  patched  po/de.po

Changes against parent e15c002b6cf19a3cf1843b35457ff8b1efa78a5a

  patched  libpurple/protocols/jabber/chat.c
  patched  libpurple/protocols/jabber/message.c