soc.2008.masterpassword: 697ed749: merge of '12059334e2e10bf7d2908323e92303...

[scrouaf at soc.pidgin.im]

-----------------------------------------------------------------
Revision: 697ed7499b60142c889757d0863053fb1ad75370
Ancestor: 12059334e2e10bf7d2908323e92303190b9d89e0
Ancestor: ceeaa5cbee1a76913f05b92133a73a7c57b16582
Author: scrouaf at soc.pidgin.im
Date: 2008-08-17T23:48:14
Branch: im.pidgin.soc.2008.masterpassword
URL: http://d.pidgin.im/viewmtn/revision/info/697ed7499b60142c889757d0863053fb1ad75370

Modified files:
        ChangeLog ChangeLog.API ChangeLog.win32 NEWS configure.ac
        libpurple/accountopt.h
        libpurple/protocols/oscar/family_oservice.c
        libpurple/protocols/oscar/oscar.c
        libpurple/protocols/oscar/oscar.h pidgin/gtkconv.c
        pidgin/pixmaps/Makefile.am

ChangeLog: 

merge of '12059334e2e10bf7d2908323e92303190b9d89e0'
     and 'ceeaa5cbee1a76913f05b92133a73a7c57b16582'