Mercurial > pidgin
diff libpurple/dbus-server.c @ 30941:8d0e0ac0bf97
merge of '903a08541756b999683e95bd5bd022856dbc122b'
and 'b79e497f79e3a9b2b2427ec0350936eea95838ee'
author | Mark Doliner <mark@kingant.net> |
---|---|
date | Sun, 21 Nov 2010 10:38:27 +0000 |
parents | 5819bf02659e |
children | 9f6b8e5998ec |