Mercurial > pidgin.yaz
diff libpurple/dbus-server.c @ 20510:b77adb803eca
explicit merge of '7aea471c6710708afa40152f5fc3aaeda3d67e76'
and 'de8f03b35895989d67321798cda909c34dfffc24'
author | Richard Laager <rlaager@wiktel.com> |
---|---|
date | Sun, 16 Sep 2007 17:59:57 +0000 |
parents | 428a3418bce5 |
children | 44b4e8bd759b |