diff libpurple/nat-pmp.c @ 30264:38d5dd9c9a07

merge of 'c4a26372086186405c4635b2fbf448b8d089f863' and 'c9659a3fecdd575434640e531c3eb61f90de6976'
author Elliott Sales de Andrade <qulogic@pidgin.im>
date Fri, 30 Apr 2010 03:35:28 +0000
parents f1437342cc0e
children 9ceccb623544
line wrap: on
line diff