soc.2008.masterpassword: 398964a8: propagate from branch 'im.pidgin.pidgin'...

[qulogic at pidgin.im]

----------------------------------------------------------------------
Revision: 398964a8feea4cf138e6260e26b155c8f0a64dc7
Parent:   e574c9373d5d4117fa7ae36e8247dfbb38017935
Parent:   f7828c5032d27f14c4543fe56ed1b5cecb5517f7
Author:   qulogic at pidgin.im
Date:     11/06/11 01:28:33
Branch:   im.pidgin.soc.2008.masterpassword
URL: http://d.pidgin.im/viewmtn/revision/info/398964a8feea4cf138e6260e26b155c8f0a64dc7

Changelog: 

propagate from branch 'im.pidgin.pidgin' (head f7828c5032d27f14c4543fe56ed1b5cecb5517f7)
            to branch 'im.pidgin.soc.2008.masterpassword' (head e574c9373d5d4117fa7ae36e8247dfbb38017935)

Changes against parent e574c9373d5d4117fa7ae36e8247dfbb38017935

  patched  libpurple/plugins/ssl/Makefile.am
  patched  pidgin/gtkblist.c
  patched  pidgin/gtkconv.c

Changes against parent f7828c5032d27f14c4543fe56ed1b5cecb5517f7

  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