pidgin: 8c6ea3b2: merge of '59b09f0d1f3f4226f7edfd83514784...

Mon Nov 17 02:45:31 EST 2008

-----------------------------------------------------------------
Revision: 8c6ea3b255d94e0f2867fea830b1380415e6d47a
Ancestor: 59b09f0d1f3f4226f7edfd8351478498fbd6b8d3
Ancestor: ca4b6e987b967927b0f8bd001bc33440a6885000
Author: markdoliner at pidgin.im
Date: 2008-11-17T07:44:40
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/8c6ea3b255d94e0f2867fea830b1380415e6d47a

Modified files:
        doc/funniest_home_convos.txt
        libpurple/protocols/jabber/jabber.c
        libpurple/protocols/msn/msn.c
        libpurple/protocols/myspace/myspace.c

ChangeLog: 

merge of '59b09f0d1f3f4226f7edfd8351478498fbd6b8d3'
     and 'ca4b6e987b967927b0f8bd001bc33440a6885000'