diff libpurple/dbus-server.c @ 22133:0d7d0a60d42d

merge of '773c6dde93b5b2109d9c627dca717dd6c5468094' and 'd25af79abd2f50e0aba4985544f0ca976d0e7788'
author John Bailey <rekkanoryo@rekkanoryo.org>
date Thu, 17 Jan 2008 05:53:25 +0000
parents 4c28d1e4e284
children 48d09d62912e
line wrap: on
line diff