Mercurial > pidgin
diff libpurple/proxy.c @ 26928:401f580d56d4
merge of '70479082260072a56b0aea40ccca311822c17155'
and 'bc7e620f5c66149f20e492d6d02c549e1fab6709'
author | Paul Aurich <paul@darkrain42.org> |
---|---|
date | Fri, 22 May 2009 00:13:38 +0000 |
parents | 4b8c4870b13a |
children | 4c3b1bb3ba91 |