pidgin: 2e248a5a: merge of '526c6b9002e19ef77ccf9723d0dd04...

[malu at pidgin.im]

-----------------------------------------------------------------
Revision: 2e248a5affa62a888ecb076170dd36d05d02dc83
Ancestor: 526c6b9002e19ef77ccf9723d0dd04a2d9287ec5
Ancestor: 73f33f8afb4c118efe65d1481a4160f9c8cfb11a
Author: malu at pidgin.im
Date: 2009-04-17T21:31:45
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/2e248a5affa62a888ecb076170dd36d05d02dc83

Modified files:
        libpurple/protocols/jabber/jabber.c
        libpurple/protocols/jabber/message.c
        libpurple/protocols/jabber/ping.c
        libpurple/protocols/yahoo/yahoo.c po/de.po

ChangeLog: 

merge of '526c6b9002e19ef77ccf9723d0dd04a2d9287ec5'
     and '73f33f8afb4c118efe65d1481a4160f9c8cfb11a'