soc.2008.masterpassword: cbb86903: propagate from branch 'im.pidgin.pidgin'...

[qulogic at pidgin.im]

----------------------------------------------------------------------
Revision: cbb869032aa6629619b29638b8eb0b2890f4948e
Parent:   d5c6616c055900fed162b21b69abc963784901e0
Parent:   ecabfaee8a1ca02e18ebadbb41cdcce19e78bc2e
Author:   qulogic at pidgin.im
Date:     01/27/12 22:43:47
Branch:   im.pidgin.soc.2008.masterpassword
URL: http://d.pidgin.im/viewmtn/revision/info/cbb869032aa6629619b29638b8eb0b2890f4948e

Changelog: 

propagate from branch 'im.pidgin.pidgin' (head ecabfaee8a1ca02e18ebadbb41cdcce19e78bc2e)
            to branch 'im.pidgin.soc.2008.masterpassword' (head d5c6616c055900fed162b21b69abc963784901e0)

Changes against parent d5c6616c055900fed162b21b69abc963784901e0

  added    pidgin/gtkwebviewtoolbar.c
  added    pidgin/gtkwebviewtoolbar.h
  patched  ChangeLog
  patched  ChangeLog.API
  patched  libpurple/blist.c
  patched  libpurple/blist.h
  patched  libpurple/protocols/jabber/caps.c
  patched  libpurple/protocols/msn/oim.c
  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
  patched  pidgin/plugins/webkit.c

Changes against parent ecabfaee8a1ca02e18ebadbb41cdcce19e78bc2e

  added    libpurple/plugins/keyrings
  added    libpurple/keyring.c
  added    libpurple/keyring.h
  added    libpurple/plugins/keyrings/Makefile.am
  added    libpurple/plugins/keyrings/gnomekeyring.c
  added    libpurple/plugins/keyrings/internalkeyring.c
  added    libpurple/plugins/keyrings/kwallet.cpp
  patched  COPYRIGHT
  patched  configure.ac
  patched  finch/gntaccount.c
  patched  finch/gntprefs.c
  patched  libpurple/Makefile.am
  patched  libpurple/account.c
  patched  libpurple/account.h
  patched  libpurple/connection.c
  patched  libpurple/connection.h
  patched  libpurple/core.c
  patched  libpurple/example/nullclient.c
  patched  libpurple/plugin.c
  patched  libpurple/plugin.h
  patched  libpurple/plugins/Makefile.am
  patched  libpurple/plugins/one_time_password.c
  patched  libpurple/plugins/perl/common/Account.xs
  patched  libpurple/plugins/perl/perl-handlers.c
  patched  libpurple/plugins/perl/perl-handlers.h
  patched  libpurple/protocols/gg/gg.c
  patched  libpurple/protocols/jabber/auth.c
  patched  libpurple/protocols/jabber/auth_cyrus.c
  patched  libpurple/protocols/jabber/jabber.c
  patched  libpurple/protocols/msn/session.c
  patched  libpurple/protocols/mxit/actions.c
  patched  libpurple/protocols/mxit/cipher.c
  patched  libpurple/protocols/mxit/login.c
  patched  libpurple/protocols/myspace/myspace.c
  patched  libpurple/protocols/novell/novell.c
  patched  libpurple/protocols/oscar/clientlogin.c
  patched  libpurple/protocols/oscar/flap_connection.c
  patched  libpurple/protocols/oscar/oscar.c
  patched  libpurple/protocols/sametime/sametime.c
  patched  libpurple/protocols/silc/silc.c
  patched  libpurple/protocols/simple/simple.c
  patched  libpurple/protocols/yahoo/libymsg.c
  patched  libpurple/prpl.c
  patched  pidgin/gtkaccount.c
  patched  pidgin/gtkconn.c
  patched  pidgin/gtkprefs.c