Mercurial > pidgin
diff libpurple/proxy.c @ 16045:1d1f8edc5f5f
merge of '8cbda621265a421cdd48fa7a90bb171ea98d3444'
and 'be6a420ff7a4679cc705c9323316d517bcdb23a8'
author | Richard Nelson <wabz@pidgin.im> |
---|---|
date | Tue, 10 Apr 2007 12:09:43 +0000 |
parents | a6a79b8616bf |
children | 4999bbc52881 |