pidgin: bbfac7ec: merge of '10d7899aac75e85039e557e2c4238e...

[qulogic at pidgin.im]

----------------------------------------------------------------------
Revision: bbfac7ec0ce58ebdb50a7cc49f3160a355ee7c54
Parent:   10d7899aac75e85039e557e2c4238e1b276a4353
Parent:   29e5737d31f8504f0f1b30ed6595671b0a735535
Author:   qulogic at pidgin.im
Date:     09/08/11 23:32:27
Branch:   im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/bbfac7ec0ce58ebdb50a7cc49f3160a355ee7c54

Changelog: 

merge of '10d7899aac75e85039e557e2c4238e1b276a4353'
     and '29e5737d31f8504f0f1b30ed6595671b0a735535'

Changes against parent 10d7899aac75e85039e557e2c4238e1b276a4353

  patched  pidgin/gtkdialogs.c
  patched  pidgin/gtknotify.c

Changes against parent 29e5737d31f8504f0f1b30ed6595671b0a735535

  patched  pidgin/gtkwebview.c