comparison libpurple/stun.c @ 32176:f2a3c59fc4a6

Fix up merge
author Paul Aurich <paul@darkrain42.org>
date Sat, 25 Jun 2011 19:56:59 +0000
parents b671728e6ee9
children 0d94c49f9545
comparison
equal deleted inserted replaced
32175:910e966d18b3 32176:f2a3c59fc4a6