pidgin: c09a27d8: merge of '88c7f87fb5a74f975cf06c472059ec...

[markdoliner at pidgin.im]

-----------------------------------------------------------------
Revision: c09a27d83b3901b84269672179f4a87e52a88600
Ancestor: 88c7f87fb5a74f975cf06c472059ecf081c54042
Ancestor: fe134224188f83f69a5367395922807444d46f49
Author: markdoliner at pidgin.im
Date: 2008-07-21T06:33:06
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/c09a27d83b3901b84269672179f4a87e52a88600

Modified files:
        libpurple/protocols/oscar/family_icq.c
        libpurple/protocols/oscar/flap_connection.c
        libpurple/protocols/oscar/oscar.c
        libpurple/protocols/oscar/oscar.h
        libpurple/protocols/oscar/oscar_data.c

ChangeLog: 

merge of '88c7f87fb5a74f975cf06c472059ecf081c54042'
     and 'fe134224188f83f69a5367395922807444d46f49'