pidgin: cf64006a: merge of '598ef461d4de936afef7298e55152c...

Wed Oct 27 14:31:10 EDT 2010

----------------------------------------------------------------------
Revision: cf64006ae2cac381ae2dd3342f3723f4f700a15c
Parent:   598ef461d4de936afef7298e55152cc7ecaa9b70
Parent:   b4c65c273f2934560d9e643a124b31ac2d2328f2
Author:   ivan.komarov at soc.pidgin.im
Date:     10/27/10 14:26:14
Branch:   im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/cf64006ae2cac381ae2dd3342f3723f4f700a15c

Changelog: 

merge of '598ef461d4de936afef7298e55152cc7ecaa9b70'
     and 'b4c65c273f2934560d9e643a124b31ac2d2328f2'

Changes against parent 598ef461d4de936afef7298e55152cc7ecaa9b70

  patched  libpurple/protocols/oscar/family_icq.c
  patched  pidgin/gtkaccount.c

Changes against parent b4c65c273f2934560d9e643a124b31ac2d2328f2

  patched  libpurple/protocols/bonjour/bonjour.c
  patched  pidgin/minidialog.c
  patched  pidgin/plugins/win32/winprefs/winprefs.c