comparison libpurple/proxy.c @ 32488:c200251415d3

merge of '20112abca39ed1b5d1b36c259a68f54bcc9af09b' and 'd5ed69a6f4347d4c5debd460aea9b4fb6a9161e8'
author Elliott Sales de Andrade <qulogic@pidgin.im>
date Fri, 02 Sep 2011 18:05:24 +0000
parents ba74745ff179
children 06e0b6be6432
comparison
equal deleted inserted replaced
32483:09449ccf8ada 32488:c200251415d3