comparison libpurple/dbus-server.c @ 23868:55fbd01442ee

merge of '2e9b29f761a49d4b15531f9efc0c1824f50cfb0d' and 'eb8c52d0929fb168ee42cc6e3a499067667eff8d'
author Stu Tomlinson <stu@nosnilmot.com>
date Wed, 20 Aug 2008 15:57:19 +0000
parents f1df88964b3d
children 8282911d5e17
comparison
equal deleted inserted replaced
23855:731241846a31 23868:55fbd01442ee