Mercurial > pidgin
comparison libpurple/stun.c @ 31138:d5b710c91104
merge of 'bdb9e04ffa44988c3cb76672342070f9e798772a'
and 'e97fa87108d60ea0e2ce4aaeaee31e5967e0b6db'
author | John Bailey <rekkanoryo@rekkanoryo.org> |
---|---|
date | Mon, 10 Jan 2011 03:30:05 +0000 |
parents | aa7c39c39af5 |
children | b671728e6ee9 |
comparison
equal
deleted
inserted
replaced
31130:38cd00d46b4d | 31138:d5b710c91104 |
---|