pidgin: 1696adf9: merge of '53630753bb021f7391e8ad30abd709...

[darkrain42 at pidgin.im]

-----------------------------------------------------------------
Revision: 1696adf9dd410d4b67f782058165fbf61cb53c61
Ancestor: 53630753bb021f7391e8ad30abd709f73fe47c3d
Ancestor: 90901b2c41b0b1a7856d9fb15fb2eb3b67383423
Author: darkrain42 at pidgin.im
Date: 2009-05-20T00:39:12
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/1696adf9dd410d4b67f782058165fbf61cb53c61

Modified files:
        libpurple/protocols/jabber/jabber.c
        libpurple/protocols/jabber/jabber.h
        libpurple/protocols/jabber/ping.c
        libpurple/protocols/jabber/ping.h

ChangeLog: 

merge of '53630753bb021f7391e8ad30abd709f73fe47c3d'
     and '90901b2c41b0b1a7856d9fb15fb2eb3b67383423'