diff libpurple/dbus-server.c @ 22610:42e94baa86b8

merge of '46c04c030c2aa142a50b7757576a659b2a5bb670' and 'dce402944e0c7e7fce6947885af42ba1ea7d8a25'
author Timo Jyrinki <timo.jyrinki@iki.fi>
date Wed, 02 Apr 2008 08:22:47 +0000
parents 48d09d62912e
children f1df88964b3d
line wrap: on
line diff