pidgin: c5d786d8: merge of '808c311196ce8853437bde38c9e3c0...

[datallah at pidgin.im]

----------------------------------------------------------------------
Revision: c5d786d8c541fd18babd7f07aff64e5e022659ce
Parent:   808c311196ce8853437bde38c9e3c0864698a4d4
Parent:   b5432d58ea3fe5a2182f1eb3ee4fceb12118f088
Author:   datallah at pidgin.im
Date:     08/29/11 18:50:03
Branch:   im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/c5d786d8c541fd18babd7f07aff64e5e022659ce

Changelog: 

merge of '808c311196ce8853437bde38c9e3c0864698a4d4'
     and 'b5432d58ea3fe5a2182f1eb3ee4fceb12118f088'

Changes against parent 808c311196ce8853437bde38c9e3c0864698a4d4

  patched  libpurple/protocols/bonjour/bonjour.c
  patched  libpurple/protocols/bonjour/bonjour_ft.c
  patched  libpurple/protocols/bonjour/jabber.c
  patched  libpurple/protocols/bonjour/mdns_avahi.c
  patched  libpurple/protocols/bonjour/mdns_common.c
  patched  libpurple/protocols/gg/buddylist.c
  patched  libpurple/protocols/gg/confer.c
  patched  libpurple/protocols/gg/gg.c
  patched  libpurple/protocols/gg/search.c
  patched  libpurple/protocols/myspace/myspace.c
  patched  libpurple/protocols/myspace/user.c
  patched  libpurple/protocols/myspace/zap.c
  patched  libpurple/protocols/novell/novell.c
  patched  libpurple/protocols/null/nullprpl.c
  patched  libpurple/protocols/oscar/oscar.c
  patched  libpurple/protocols/simple/simple.c
  patched  libpurple/protocols/zephyr/zephyr.c

Changes against parent b5432d58ea3fe5a2182f1eb3ee4fceb12118f088

  patched  pidgin/gtkconv.c