diff libpurple/purple-send @ 25920:9122bf747d3a

explicit merge of 'f29c90f0da72e27c601fd8c4e1aff2a250a52473' and '8808ecc9353df49f85e0a292d690631c0ce895b5' to branch 'im.pidgin.cpw.darkrain42.xmpp.bosh'
author Paul Aurich <paul@darkrain42.org>
date Sat, 07 Mar 2009 01:36:57 +0000
parents 942bf314fc8a
children cea56d000b16
line wrap: on
line diff