Mercurial > pidgin
diff libpurple/network.c @ 15771:52ee22ba2cd2
merge of '8d1175446aba95222f38c31207ca29c492f9d0fb'
and 'd59e830c02b5909e91b567258fca78dc9af8e282'
| author | Mark Doliner <mark@kingant.net> |
|---|---|
| date | Mon, 05 Mar 2007 01:58:25 +0000 |
| parents | 552be3958d6a |
| children | 32c366eeeb99 |
