Mercurial > pidgin
diff libpurple/connection.c @ 29256:f050972561d5
merge of '49798f68cc38cddbf1fb0ef1b458d1adec2f3b12'
and 'f00591c7734e6f35f76c71eabfa9acf81edc3107'
author | Marcus Lundblad <ml@update.uu.se> |
---|---|
date | Thu, 30 Oct 2008 21:00:25 +0000 |
parents | 2b426862ffbf |
children | aaaff38e144f 8282911d5e17 9ded0fb57e1c |