pidgin: 3d8e91c5: merge of '13d6e924c9257b20e21050646cab88...

[andrew.victor at mxit.com]

----------------------------------------------------------------------
Revision: 3d8e91c51b0a85143e2d52f1f845557cf981ca80
Parent:   13d6e924c9257b20e21050646cab88043bdb2e15
Parent:   a07b7bfd5f979c74126ebea4f86249f24ff00dfd
Author:   andrew.victor at mxit.com
Date:     01/09/12 06:32:01
Branch:   im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/3d8e91c51b0a85143e2d52f1f845557cf981ca80

Changelog: 

merge of '13d6e924c9257b20e21050646cab88043bdb2e15'
     and 'a07b7bfd5f979c74126ebea4f86249f24ff00dfd'

Changes against parent 13d6e924c9257b20e21050646cab88043bdb2e15

  patched  libpurple/protocols/jabber/caps.c

Changes against parent a07b7bfd5f979c74126ebea4f86249f24ff00dfd

  added    pidgin/gtkwebviewtoolbar.c
  added    pidgin/gtkwebviewtoolbar.h
  patched  ChangeLog
  patched  libpurple/protocols/oscar/util.c
  patched  pidgin/Makefile.am
  patched  pidgin/Makefile.mingw
  patched  pidgin/gtkconv.c
  patched  pidgin/gtkprefs.c
  patched  pidgin/gtkutils.c
  patched  pidgin/gtkutils.h
  patched  pidgin/gtkwebview.c
  patched  pidgin/gtkwebview.h