adium.1-3: c0f585e3: merge of '91e640292239469b703698494c494e...

[evands at pidgin.im]

-----------------------------------------------------------------
Revision: c0f585e39e1d50efe59a4a10347731b3a2cd7e20
Ancestor: 91e640292239469b703698494c494e6da907f27f
Ancestor: f220b7a9562f71bc759b1e4a4ef84d8aed0a88b2
Author: evands at pidgin.im
Date: 2009-08-20T02:26:32
Branch: im.pidgin.adium.1-3
URL: http://d.pidgin.im/viewmtn/revision/info/c0f585e39e1d50efe59a4a10347731b3a2cd7e20

Added files:
        libpurple/protocols/facebook/fb_friendlist.c
        libpurple/protocols/facebook/fb_friendlist.h
        libpurple/protocols/facebook/fb_json.c
        libpurple/protocols/facebook/fb_json.h
Modified files:
        libpurple/protocols/facebook/Makefile.am

ChangeLog: 

merge of '91e640292239469b703698494c494e6da907f27f'
     and 'f220b7a9562f71bc759b1e4a4ef84d8aed0a88b2'