comparison libpurple/nat-pmp.c @ 31660:5dccfd26108b

merge of '84e4c2078413eedc9eaea26df534ecca59425b69' and 'f23ff84c6d73ce743343a1f0547b7e0dba692407'
author Paul Aurich <paul@darkrain42.org>
date Tue, 15 Feb 2011 15:49:58 +0000
parents f1437342cc0e
children 9ceccb623544
comparison
equal deleted inserted replaced
31658:0dade4c34d24 31660:5dccfd26108b