Mercurial > pidgin
diff libpurple/proxy.c @ 24540:db414e4b966b
merge of '0398d649eb2c6ff34c18ee43f0599f3eb0085b5c'
and '6729d3dea8df2203383212a82eddd4697ea70ee9'
author | Richard Laager <rlaager@wiktel.com> |
---|---|
date | Wed, 26 Nov 2008 21:10:26 +0000 |
parents | f3103f786c86 |
children | 95ef7beb926b 9bc0c3274c3c |