comparison libpurple/nat-pmp.c @ 26363:88f413d12917

merge of '25cc5bdbbd9c509be202ab9847764b104f848577' and '7bc60f1fd2abbf238f52a98f1f26da74ca462705'
author Mike Ruprecht <maiku@soc.pidgin.im>
date Tue, 24 Mar 2009 06:09:35 +0000
parents 584063555949
children 75654d6b2b4d e45fe73b47e3
comparison
equal deleted inserted replaced
26361:e9b5d68887ff 26363:88f413d12917