comparison libpurple/network.c @ 31355:d9db23719cf9

merge of '148e99c7c4a60cc18826232bd8b3270cbdddc7b5' and '89847795e1c9cbdd51c942ae1e506e6060ac2235'
author Daniel Atallah <daniel.atallah@gmail.com>
date Mon, 08 Nov 2010 22:51:35 +0000
parents 47ea27481972
children 18d56b13fe8b
comparison
equal deleted inserted replaced
31354:4de2b3adc823 31355:d9db23719cf9