rcollier 3f89df061d Merged the 3.2 branch back into trunk. ... git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@12588 b35dd754-fafc-0310-a699-88a17e54d16e		2011-09-09 01:26:22 +00:00
..
bytestreams	merged branch improve_bytestreams in trunk	2010-08-15 11:57:11 +00:00
filetransfer	SMACK-334 FileTransferNegotiator now passes the correct type in the stream-method variable.	2011-03-30 00:43:35 +00:00
muc	SMACK-163 Fixed NPE in accessing form field information.	2011-03-29 00:44:38 +00:00
provider	improved Delay Information Parser (fixes SMACK-243)	2010-08-15 13:20:48 +00:00
pubsub	Merged the 3.2 branch back into trunk.	2011-09-09 01:26:22 +00:00