pidgin: 98ca3d09: merge of '30f572d2b51bbd14c6b0c0539e0ce2...

Sat Oct 30 17:40:26 EDT 2010

----------------------------------------------------------------------
Revision: 98ca3d09184652530af144563694e1dbbb5af168
Parent:   30f572d2b51bbd14c6b0c0539e0ce299617b1aff
Parent:   bc9c4bb89eb6d36c548b61d8b1e6b8952b9c4c0e
Author:   ivan.komarov at soc.pidgin.im
Date:     10/30/10 17:27:00
Branch:   im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/98ca3d09184652530af144563694e1dbbb5af168

Changelog: 

merge of '30f572d2b51bbd14c6b0c0539e0ce299617b1aff'
     and 'bc9c4bb89eb6d36c548b61d8b1e6b8952b9c4c0e'

Changes against parent 30f572d2b51bbd14c6b0c0539e0ce299617b1aff

  patched  libpurple/protocols/oscar/flap_connection.c

Changes against parent bc9c4bb89eb6d36c548b61d8b1e6b8952b9c4c0e

  patched  libpurple/protocols/oscar/family_oservice.c