pidgin: 4550b953: merge of 'd74415beaf0f8e1ed4743514e1d906...

Mon Sep 5 15:10:49 EDT 2011

----------------------------------------------------------------------
Revision: 4550b9538730036d9023f75e224ffb15f50f020f
Parent:   d74415beaf0f8e1ed4743514e1d90669676b8596
Parent:   f21ba844464858c0ea853c940fd4433ce008cb07
Author:   andrew.victor at mxit.com
Date:     09/01/11 14:26:08
Branch:   im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/4550b9538730036d9023f75e224ffb15f50f020f

Changelog: 

merge of 'd74415beaf0f8e1ed4743514e1d90669676b8596'
     and 'f21ba844464858c0ea853c940fd4433ce008cb07'

Changes against parent d74415beaf0f8e1ed4743514e1d90669676b8596

  patched  ChangeLog.API
  patched  finch/gntblist.c
  patched  libpurple/ft.c
  patched  libpurple/ft.h
  patched  libpurple/util.c
  patched  libpurple/util.h
  patched  pidgin/gtkimhtml.c
  patched  pidgin/gtkimhtml.h
  patched  pidgin/gtkutils.c
  patched  pidgin/plugins/perl/common/GtkIMHtml.xs

Changes against parent f21ba844464858c0ea853c940fd4433ce008cb07

  patched  libpurple/protocols/bonjour/mdns_win32.c
  patched  libpurple/protocols/myspace/user.c