comparison libpurple/plugins/joinpart.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 b87843de7c6a
children 088a828fe2e2
comparison
equal deleted inserted replaced
26716:474a0cb44f58 26728:d06af7664a7a