diff libpurple/dbus-server.c @ 17328:3ff22e68337f

merge of '885cfa74f3bd945a11b82df9d3a8a1727cbcf592' and 'd1cff25b68dd1a54b088fc79b94cd2def7c7e222'
author Jeffrey Connelly <jaconnel@calpoly.edu>
date Fri, 01 Jun 2007 04:09:41 +0000
parents 3130a2cfe4e0
children 9f5c9df30287 3f11fad07eda
line wrap: on
line diff