pidgin: 84de7791: merge of '5e579d58062410991f6268b66906fb...

[ivan.komarov at soc.pidgin.im]

----------------------------------------------------------------------
Revision: 84de77912c6670e7b44c355eef73363809698565
Parent:   5e579d58062410991f6268b66906fb7434730423
Parent:   7eb555d9d20df94a7bef577253c8effb724ab484
Author:   ivan.komarov at soc.pidgin.im
Date:     11/02/10 16:51:44
Branch:   im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/84de77912c6670e7b44c355eef73363809698565

Changelog: 

merge of '5e579d58062410991f6268b66906fb7434730423'
     and '7eb555d9d20df94a7bef577253c8effb724ab484'

Changes against parent 5e579d58062410991f6268b66906fb7434730423

  patched  ChangeLog
  patched  libpurple/account.c
  patched  libpurple/protocols/jabber/adhoccommands.c
  patched  libpurple/protocols/jabber/auth.c
  patched  libpurple/protocols/jabber/auth.h
  patched  libpurple/protocols/jabber/presence.c
  patched  libpurple/protocols/oscar/oscar.c

Changes against parent 7eb555d9d20df94a7bef577253c8effb724ab484

  patched  libpurple/protocols/oscar/encoding.c