soc.2008.masterpassword: 6a6ff80e: propagate from branch 'im.pidgin.pidgin'...

[qulogic at pidgin.im]

----------------------------------------------------------------------
Revision: 6a6ff80eb9717e773b178bb27c1d2c021d526244
Parent:   41399c80e051ca0252ced04d4c6cdf2dd6260229
Parent:   7fec7c54b956f2edd3138f6873f9a535b036bf4c
Author:   qulogic at pidgin.im
Date:     12/16/11 01:29:00
Branch:   im.pidgin.soc.2008.masterpassword
URL: http://d.pidgin.im/viewmtn/revision/info/6a6ff80eb9717e773b178bb27c1d2c021d526244

Changelog: 

propagate from branch 'im.pidgin.pidgin' (head 41399c80e051ca0252ced04d4c6cdf2dd6260229)
            to branch 'im.pidgin.soc.2008.masterpassword' (head 7fec7c54b956f2edd3138f6873f9a535b036bf4c)

Changes against parent 41399c80e051ca0252ced04d4c6cdf2dd6260229

  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

Changes against parent 7fec7c54b956f2edd3138f6873f9a535b036bf4c

  patched  ChangeLog
  patched  ChangeLog.API
  patched  libpurple/cmds.c
  patched  libpurple/prefs.c
  patched  libpurple/protocols/bonjour/bonjour_ft.c
  patched  libpurple/protocols/bonjour/jabber.c
  patched  libpurple/protocols/bonjour/jabber.h
  patched  libpurple/protocols/bonjour/mdns_avahi.c
  patched  libpurple/protocols/irc/parse.c
  patched  libpurple/protocols/jabber/jingle/jingle.c
  patched  libpurple/protocols/jabber/jingle/rtp.c
  patched  libpurple/protocols/jabber/jingle/session.c
  patched  libpurple/protocols/oscar/family_feedbag.c
  patched  libpurple/protocols/oscar/oscar.c
  patched  libpurple/protocols/silc/ops.c
  patched  libpurple/purple-3.pc.in
  patched  libpurple/util.c
  patched  libpurple/util.h
  patched  libpurple/win32/libc_interface.c
  patched  libpurple/win32/libc_interface.h
  patched  libpurple/win32/libc_internal.h
  patched  pidgin/gtkprefs.c
  patched  pidgin/pidgin-3.pc.in
  patched  po/ChangeLog
  patched  po/de.po