Mercurial > pidgin.yaz
comparison libpurple/server.c @ 30140:a3b78a080a5b
merge of '1993306ee130a8c1c8eb294a1a05f86aa098cb9f'
and 'e5c9e334137918bc4e82fa4a3305623348817152'
author | Paul Aurich <paul@darkrain42.org> |
---|---|
date | Wed, 14 Apr 2010 19:58:42 +0000 |
parents | 43d5face5d9b |
children | 01a27787f8c9 91e8402106c1 |
comparison
equal
deleted
inserted
replaced
30138:62cc2156961f | 30140:a3b78a080a5b |
---|