pidgin: cbd1eda6: merge of '688484ce559f68e7d5e5ac8e67cc66...

[qulogic at pidgin.im]

----------------------------------------------------------------------
Revision: cbd1eda6bcbf0565ae7766396bb8f6f419cb6a9a
Parent:   688484ce559f68e7d5e5ac8e67cc667f96c3791a
Parent:   9b2b55b0c80013fc7794f6334575fb6b7e9ed5b7
Author:   qulogic at pidgin.im
Date:     05/31/12 02:20:22
Branch:   im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/cbd1eda6bcbf0565ae7766396bb8f6f419cb6a9a

Changelog: 

merge of '688484ce559f68e7d5e5ac8e67cc667f96c3791a'
     and '9b2b55b0c80013fc7794f6334575fb6b7e9ed5b7'

Changes against parent 688484ce559f68e7d5e5ac8e67cc667f96c3791a

  patched  pidgin/gtknotify.c
  patched  pidgin/gtkwebview.c
  patched  pidgin/gtkwebview.h
  patched  pidgin/plugins/xmppconsole.c

Changes against parent 9b2b55b0c80013fc7794f6334575fb6b7e9ed5b7

  patched  ChangeLog
  patched  pidgin/gtkconv.c