soc.2008.masterpassword: 45a9b600: propagate from branch 'im.pidgin.pidgin'...

[qulogic at pidgin.im]

----------------------------------------------------------------------
Revision: 45a9b6003104ecc43f4d2e9ab4e259480be554c0
Parent:   d936cec62f2fb881a134401b50b703c14037a8c1
Parent:   deb06ab6aa118efb674f1a8434ff529e67b28809
Author:   qulogic at pidgin.im
Date:     02/23/12 03:13:29
Branch:   im.pidgin.soc.2008.masterpassword
URL: http://d.pidgin.im/viewmtn/revision/info/45a9b6003104ecc43f4d2e9ab4e259480be554c0

Changelog: 

propagate from branch 'im.pidgin.pidgin' (head deb06ab6aa118efb674f1a8434ff529e67b28809)
            to branch 'im.pidgin.soc.2008.masterpassword' (head d936cec62f2fb881a134401b50b703c14037a8c1)

Changes against parent d936cec62f2fb881a134401b50b703c14037a8c1

  added    finch/gntmenuutil.c
  added    finch/gntmenuutil.h
  patched  ChangeLog
  patched  finch/Makefile.am
  patched  finch/gntblist.c
  patched  finch/gntconv.c
  patched  finch/gntconv.h
  patched  libpurple/protocols/msn/contact.c
  patched  libpurple/protocols/msn/contact.h
  patched  libpurple/protocols/msn/msn.c
  patched  libpurple/protocols/msn/msn.h
  patched  libpurple/protocols/msn/msnutils.c
  patched  libpurple/protocols/msn/msnutils.h
  patched  libpurple/protocols/msn/nexus.c
  patched  libpurple/protocols/msn/nexus.h
  patched  libpurple/protocols/msn/notification.c
  patched  libpurple/protocols/msn/notification.h
  patched  libpurple/protocols/msn/oim.c
  patched  libpurple/protocols/msn/session.c
  patched  libpurple/protocols/msn/state.c
  patched  libpurple/protocols/msn/switchboard.c
  patched  libpurple/protocols/msn/user.c
  patched  libpurple/protocols/oscar/family_feedbag.c
  patched  libpurple/protocols/oscar/family_icbm.c
  patched  libpurple/protocols/oscar/oscar.c
  patched  libpurple/protocols/oscar/oscar.h
  patched  libpurple/protocols/oscar/peer.c
  patched  pidgin/gtkconv.c
  patched  pidgin/gtkdialogs.c
  patched  pidgin/gtkprefs.c
  patched  pidgin/gtkwebview.c
  patched  pidgin/plugins/disco/gtkdisco.c

Changes against parent deb06ab6aa118efb674f1a8434ff529e67b28809

  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