pidgin: e64cb62e: merge of '06e774c0ba90c7cb6ce1c2299d19bb...

Thu Feb 24 13:05:42 EST 2011

----------------------------------------------------------------------
Revision: e64cb62ec0098e63abbad8bff1843969c66458d4
Parent:   06e774c0ba90c7cb6ce1c2299d19bb31c24fab05
Parent:   962710d72c1f2eb3170a63fefc39af2d5b34e6a5
Author:   darkrain42 at pidgin.im
Date:     02/24/11 13:02:21
Branch:   im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/e64cb62ec0098e63abbad8bff1843969c66458d4

Changelog: 

merge of '06e774c0ba90c7cb6ce1c2299d19bb31c24fab05'
     and '962710d72c1f2eb3170a63fefc39af2d5b34e6a5'

Changes against parent 06e774c0ba90c7cb6ce1c2299d19bb31c24fab05

  patched  libpurple/protocols/jabber/auth_scram.c

Changes against parent 962710d72c1f2eb3170a63fefc39af2d5b34e6a5

  patched  libpurple/ciphers/sha1.c
  patched  libpurple/conversation.c
  patched  libpurple/conversation.h
  patched  libpurple/protocols/irc/irc.c
  patched  libpurple/protocols/irc/irc.h
  patched  libpurple/protocols/irc/msgs.c
  patched  libpurple/protocols/irc/parse.c
  patched  pidgin/gtkblist.c