im.pidgin.pidgin: b258cff50ffc5f9b23d522eab379acdd543fd54c

Wed Jan 2 01:47:14 EST 2008

-----------------------------------------------------------------
Revision: b258cff50ffc5f9b23d522eab379acdd543fd54c
Ancestor: 09b67b44dabe98093e6dc706c0d731212e129a79
Ancestor: fb375dc299f22214e1d15477b0df15409d5362e1
Author: evands at pidgin.im
Date: 2007-12-30T10:06:58
Branch: im.pidgin.pidgin

Modified files:
        ChangeLog libpurple/protocols/myspace/myspace.c
        pidgin/gtkconv.c

ChangeLog: 

merge of '09b67b44dabe98093e6dc706c0d731212e129a79'
     and 'fb375dc299f22214e1d15477b0df15409d5362e1'