Mercurial > pidgin.yaz
diff libpurple/proxy.c @ 22480:633eabc7eff4
merge of 'c2f80865e78beb384f2dec792cac08ac44cf4eea'
and 'ddb947301980e564af0ce937a3c94e5b6116304c'
author | Stu Tomlinson <stu@nosnilmot.com> |
---|---|
date | Mon, 17 Mar 2008 01:56:29 +0000 |
parents | 3225c99785b8 |
children | 5a0186edda97 |