Mercurial > pidgin
comparison libpurple/server.c @ 26044:b04508e5cc6c
merge of 'd43b253ca7568a3f07aa77bf397fe4351db73a90'
and 'dcc53c9783aecbdde6269c4310ec4b0cf511bd9e'
author | Marcus Lundblad <ml@update.uu.se> |
---|---|
date | Mon, 12 Jan 2009 19:27:55 +0000 |
parents | 75690a3eeee0 |
children | 1cf0b4f71d16 43b721aa4b76 |
comparison
equal
deleted
inserted
replaced
26043:e5f9cf20c4aa | 26044:b04508e5cc6c |
---|