pidgin: e15c002b: merge of '5b9ae21a0927d9a160964bfb1cad7a...

[qulogic at pidgin.im]

----------------------------------------------------------------------
Revision: e15c002b6cf19a3cf1843b35457ff8b1efa78a5a
Parent:   5b9ae21a0927d9a160964bfb1cad7a43253fba0d
Parent:   874c07e0346e899fe81f0ecd50471f478e1161c9
Author:   qulogic at pidgin.im
Date:     07/31/10 19:43:37
Branch:   im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/e15c002b6cf19a3cf1843b35457ff8b1efa78a5a

Changelog: 

merge of '5b9ae21a0927d9a160964bfb1cad7a43253fba0d'
     and '874c07e0346e899fe81f0ecd50471f478e1161c9'

Changes against parent 5b9ae21a0927d9a160964bfb1cad7a43253fba0d

  patched  po/de.po

Changes against parent 874c07e0346e899fe81f0ecd50471f478e1161c9

  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