Mercurial > pidgin
diff libpurple/proxy.c @ 18429:10af8f0ccb6b
merge of 'c0dada8d5e1c72e70d6918a158d0c4edf662cf88'
and 'fe3b2f22f6faf15c3a0c1bde403dc1e09d8c2d08'
author | Stu Tomlinson <stu@nosnilmot.com> |
---|---|
date | Wed, 04 Jul 2007 03:43:37 +0000 |
parents | 79ecaab86f91 |
children | 57d350900136 941965d6fd88 |