Mercurial > pidgin.yaz
diff libpurple/server.c @ 20108:88b97e07f35f
merge of '688a896af7f228132e0f78057e7ed5812c3f7b13'
and 'a6d6e5d83afac011fd739de6e393618695171e7c'
author | Will Thompson <will.thompson@collabora.co.uk> |
---|---|
date | Tue, 18 Sep 2007 16:32:46 +0000 |
parents | 669c152c0290 |
children | 7393ee28c819 |