pidgin: b54edd5a: merge of '24528e4f31b9f94a34143911113dc5...

[darkrain42 at pidgin.im]

----------------------------------------------------------------------
Revision: b54edd5a2c349ffb17f70c65398b502a0bfb2d4a
Parent:   24528e4f31b9f94a34143911113dc52ec45fb69f
Parent:   2e5091744455ac1d4bfe149a858914dfe02588cc
Author:   darkrain42 at pidgin.im
Date:     05/04/11 22:42:42
Branch:   im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/b54edd5a2c349ffb17f70c65398b502a0bfb2d4a

Changelog: 

merge of '24528e4f31b9f94a34143911113dc52ec45fb69f'
     and '2e5091744455ac1d4bfe149a858914dfe02588cc'

Changes against parent 24528e4f31b9f94a34143911113dc52ec45fb69f

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

Changes against parent 2e5091744455ac1d4bfe149a858914dfe02588cc

  patched  libpurple/protocols/jabber/presence.c