comparison libpurple/nat-pmp.h @ 30950:e946cb06faec

merge of '3d06a17dd5bf8095f142141e395986dda870cfe6' and 'f34878b425fc3e5501d82254e87d1d9271470428'
author Elliott Sales de Andrade <qulogic@pidgin.im>
date Mon, 22 Nov 2010 03:04:17 +0000
parents 6bf32c9e15a7
children 98520ee78f12
comparison
equal deleted inserted replaced
30948:b64b2b05bd3c 30950:e946cb06faec