Mercurial > pidgin
diff libpurple/proxy.c @ 23520:9acfa387c0a2
merge of '67ca4287c39e084b96718b0e1768578954ac66a5'
and '7b988958a7a70ec7281d5843d8f04ec973a7ac1f'
author | Elliott Sales de Andrade <qulogic@pidgin.im> |
---|---|
date | Sat, 12 Jul 2008 04:50:47 +0000 |
parents | 242fd82b5fe6 |
children | 5c70d953a497 |