pidgin: 9ad89488: merge of 'b777f3c2f3b9991830f31a5572d2bb...

[rlaager at pidgin.im]

-----------------------------------------------------------------
Revision: 9ad89488379a97b5cfae59ae91eef9212f229b96
Ancestor: b777f3c2f3b9991830f31a5572d2bb0b030c2600
Ancestor: b8d6086aef6b2e65d86e8ce60220ab7f460d5079
Author: rlaager at pidgin.im
Date: 2008-12-12T20:35:12
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/9ad89488379a97b5cfae59ae91eef9212f229b96

Deleted entries:
        libpurple/protocols/myspace/CHANGES
        libpurple/protocols/myspace/ChangeLog
        libpurple/protocols/myspace/LICENSE
        libpurple/protocols/myspace/release.sh
Modified files:
        COPYING ChangeLog libpurple/protocols/myspace/markup.c

ChangeLog: 

merge of 'b777f3c2f3b9991830f31a5572d2bb0b030c2600'
     and 'b8d6086aef6b2e65d86e8ce60220ab7f460d5079'