pidgin: 448583a7: merge of 'b70000f3bf5c6b7f30121fb749d72a...

[qulogic at pidgin.im]

-----------------------------------------------------------------
Revision: 448583a763dcf343f1a4392bdcdcc4c4f01f3aed
Ancestor: b70000f3bf5c6b7f30121fb749d72ac869b58ae9
Ancestor: cd296a8ef14b597780af9c7d28af18a4913c252c
Author: qulogic at pidgin.im
Date: 2008-12-16T02:25:08
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/448583a763dcf343f1a4392bdcdcc4c4f01f3aed

Modified files:
        ChangeLog libpurple/protocols/msn/nexus.c
        libpurple/protocols/myspace/message.c
        libpurple/protocols/myspace/message.h
        libpurple/protocols/myspace/myspace.c
        libpurple/protocols/myspace/session.h
        libpurple/protocols/myspace/user.c
        libpurple/protocols/myspace/user.h po/de.po

ChangeLog: 

merge of 'b70000f3bf5c6b7f30121fb749d72ac869b58ae9'
     and 'cd296a8ef14b597780af9c7d28af18a4913c252c'