im.pidgin.pidgin: ee94ea5a4f377fefb34bc45b63e66ea4d8768ee6

[markdoliner at pidgin.im]

-----------------------------------------------------------------
Revision: ee94ea5a4f377fefb34bc45b63e66ea4d8768ee6
Ancestor: 59861e303c2e7d7bfe9c10a06497b1aaa47d6588
Ancestor: 74122e66cd2ced071a030e5c2b33b64622b2fead
Author: markdoliner at pidgin.im
Date: 2008-01-15T17:56:16
Branch: im.pidgin.pidgin

Modified files:
        COPYRIGHT ChangeLog libpurple/protocols/oscar/libaim.c
        libpurple/protocols/oscar/libicq.c
        libpurple/protocols/yahoo/util.c
        libpurple/protocols/yahoo/yahoo.h
        libpurple/protocols/yahoo/yahoo_aliases.c

ChangeLog: 

merge of '59861e303c2e7d7bfe9c10a06497b1aaa47d6588'
     and '74122e66cd2ced071a030e5c2b33b64622b2fead'