cpw.darkrain42.xmpp.bosh: f2474e6f: merge of 'e50b65be3a30b5e9c665a8ee87d28f...

[paul at darkrain42.org]

-----------------------------------------------------------------
Revision: f2474e6f2c0cdbf57094518f68b5b3efbdbb9cc3
Ancestor: e50b65be3a30b5e9c665a8ee87d28f19e225f459
Ancestor: e75da66768159491d6adf832c4cef8d3f88ce2d0
Author: paul at darkrain42.org
Date: 2009-03-15T04:49:00
Branch: im.pidgin.cpw.darkrain42.xmpp.bosh
URL: http://d.pidgin.im/viewmtn/revision/info/f2474e6f2c0cdbf57094518f68b5b3efbdbb9cc3

Modified files:
        libpurple/protocols/jabber/bosh.c
        libpurple/protocols/jabber/presence.c

ChangeLog: 

merge of 'e50b65be3a30b5e9c665a8ee87d28f19e225f459'
     and 'e75da66768159491d6adf832c4cef8d3f88ce2d0'