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

[scrouaf at soc.pidgin.im]

-----------------------------------------------------------------
Revision: 12059334e2e10bf7d2908323e92303190b9d89e0
Ancestor: 81d85803cc285bbdab625c4d138d66792b8694bb
Ancestor: 839b5333f46e3df6e9893b81ccfc124324586fe4
Author: scrouaf at soc.pidgin.im
Date: 2008-08-17T22:59:33
Branch: im.pidgin.soc.2008.masterpassword
URL: http://d.pidgin.im/viewmtn/revision/info/12059334e2e10bf7d2908323e92303190b9d89e0

Added files:
        libpurple/keyring.c libpurple/keyring.h
        libpurple/plugins/keyrings/Makefile.am
        libpurple/plugins/keyrings/gnomekeyring.c
        libpurple/plugins/keyrings/internalkeyring.c
Added directories:
        libpurple/plugins/keyrings
Modified files:
        COPYRIGHT ChangeLog ChangeLog.API ChangeLog.win32 NEWS
        configure.ac finch/gntaccount.c finch/gntprefs.c
        libpurple/Makefile.am libpurple/account.c
        libpurple/account.h libpurple/accountopt.h
        libpurple/connection.c libpurple/connection.h
        libpurple/core.c libpurple/example/nullclient.c
        libpurple/plugin.c libpurple/plugin.h
        libpurple/plugins/Makefile.am
        libpurple/protocols/oscar/family_oservice.c
        libpurple/protocols/oscar/oscar.c
        libpurple/protocols/oscar/oscar.h libpurple/prpl.c
        libpurple/xmlnode.h pidgin/gtkaccount.c pidgin/gtkconv.c
        pidgin/gtkprefs.c pidgin/pixmaps/Makefile.am

ChangeLog: 

propagate from branch 'im.pidgin.pidgin' (head 839b5333f46e3df6e9893b81ccfc124324586fe4)
            to branch 'im.pidgin.soc.2008.masterpassword' (head 81d85803cc285bbdab625c4d138d66792b8694bb)