diff libpurple/dbus-server.c @ 15629:2f0f563b3579

merge of '7822ac971c736a7e6545da828b1b79db67ad732f' and 'edc9bd8e3fe860539f170f241e440e214993fcaf'
author Mark Doliner <mark@kingant.net>
date Tue, 13 Feb 2007 07:03:51 +0000
parents 5fe8042783c1
children 32c366eeeb99
line wrap: on
line diff