pidgin: 3dd9c7e4: merge of '5097d28816eecf123094d27602b149...

Fri Dec 12 21:45:55 EST 2008

-----------------------------------------------------------------
Revision: 3dd9c7e41e98570d3626051c1fa70d698554a58a
Ancestor: 5097d28816eecf123094d27602b14963619bbc8b
Ancestor: 9ad89488379a97b5cfae59ae91eef9212f229b96
Author: markdoliner at pidgin.im
Date: 2008-12-13T02:41:46
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/3dd9c7e41e98570d3626051c1fa70d698554a58a

Modified files:
        ChangeLog libpurple/protocols/myspace/markup.c

ChangeLog: 

merge of '5097d28816eecf123094d27602b14963619bbc8b'
     and '9ad89488379a97b5cfae59ae91eef9212f229b96'