comparison libpurple/nat-pmp.c @ 30667:f55609d9bea5

merge of '9e21ee2eab363a8afc2552ab67c23b90a88d7553' and 'ab6bb200fc9274b04542f7161ebc2f03db5b1585'
author Elliott Sales de Andrade <qulogic@pidgin.im>
date Sat, 03 Jul 2010 23:48:50 +0000
parents f1437342cc0e
children 9ceccb623544
comparison
equal deleted inserted replaced
30664:28df1fdba52e 30667:f55609d9bea5