Mercurial > pidgin
diff libpurple/marshallers.list @ 26380:b0a9c48b5f69
merge of '2d0e977ba883c0b9d24d52360839cfed7cf1f2a6'
and 'e9514d92cd62759a80a75f93b308e4fd05afe673'
author | Mike Ruprecht <maiku@soc.pidgin.im> |
---|---|
date | Mon, 30 Mar 2009 04:15:53 +0000 |
parents | 4e1286e76f1f |
children | a78adf8b4b28 |