comparison libpurple/stun.c @ 29715:c4ed54041d6e

merge of 'd667c60d4307344e071846ebcf72ed5458183434' and 'e6b0cddc47249918d5697b1f0a4c512db4fef0d3'
author Daniel Atallah <daniel.atallah@gmail.com>
date Fri, 20 Nov 2009 00:33:23 +0000
parents 627d23bfdb05
children aa7c39c39af5
comparison
equal deleted inserted replaced
29714:bd7159aeabc0 29715:c4ed54041d6e