Mercurial > pidgin
diff libpurple/proxy.c @ 24731:fbb239fc7396
merge of '9d9dfe16667a3946233ae2a359de8856ee105289'
and 'f5de7408fa8d5aed024aaa8c74d7a2d692816b21'
| author | Ka-Hing Cheung <khc@hxbc.us> |
|---|---|
| date | Mon, 15 Dec 2008 00:09:04 +0000 |
| parents | f3103f786c86 |
| children | 95ef7beb926b 9bc0c3274c3c |
