Mercurial > pidgin
diff libpurple/proxy.c @ 28350:911560d0c36f
merge of '0818f22621a06fa5a61bba3d4a10de1e42813cfa'
and '4b9ca13f2987492c10363d58816d0a2e5bdee54c'
author | Paul Aurich <paul@darkrain42.org> |
---|---|
date | Fri, 09 Oct 2009 01:39:41 +0000 |
parents | 30497d814cb9 |
children | f2a69bee9ef6 |