comparison libpurple/server.c @ 26728:d06af7664a7a

merge of '6a70c2c1325aeb644bff8476f94c5a25f83044fb' and 'd5a487de6cafd4f773a3cc1b9b08d6081771e9de'
author Marcus Lundblad <ml@update.uu.se>
date Wed, 22 Apr 2009 18:37:31 +0000
parents fb44acfae441
children 1ba4bbd3b0cd 1337d2813b2d
comparison
equal deleted inserted replaced
26716:474a0cb44f58 26728:d06af7664a7a