pidgin: b4610e0a: merge of '15d262d25f6f81c8bf68b2de436e86...

[bjoern at cs.tu-berlin.de]

----------------------------------------------------------------------
Revision: b4610e0aa7f5df4daa5d4ad90ce8a8d80f46e0fe
Parent:   15d262d25f6f81c8bf68b2de436e86b672f8d980
Parent:   bf86d3d8ea90883936e561e4903aef752403a999
Author:   bjoern at cs.tu-berlin.de
Date:     05/04/11 02:46:04
Branch:   im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/b4610e0aa7f5df4daa5d4ad90ce8a8d80f46e0fe

Changelog: 

merge of '15d262d25f6f81c8bf68b2de436e86b672f8d980'
     and 'bf86d3d8ea90883936e561e4903aef752403a999'

Changes against parent 15d262d25f6f81c8bf68b2de436e86b672f8d980

  patched  po/de.po

Changes against parent bf86d3d8ea90883936e561e4903aef752403a999

  patched  libpurple/protocols/bonjour/jabber.c
  patched  libpurple/protocols/bonjour/jabber.h