pidgin: 1d671713: merge of '6c7b27abd37198a7bf98e925529915...

Tue Sep 21 00:41:06 EDT 2010

----------------------------------------------------------------------
Revision: 1d67171359a2962c400a3fe905f7a73233a52443
Parent:   6c7b27abd37198a7bf98e9255299159259bcffc7
Parent:   bdb5fe6e0e06c8f8275aff942d31b2d4359487bb
Author:   qulogic at pidgin.im
Date:     09/21/10 00:37:26
Branch:   im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/1d67171359a2962c400a3fe905f7a73233a52443

Changelog: 

merge of '6c7b27abd37198a7bf98e9255299159259bcffc7'
     and 'bdb5fe6e0e06c8f8275aff942d31b2d4359487bb'

Changes against parent 6c7b27abd37198a7bf98e9255299159259bcffc7

  patched  ChangeLog

Changes against parent bdb5fe6e0e06c8f8275aff942d31b2d4359487bb

  patched  COPYRIGHT
  patched  ChangeLog
  patched  libpurple/protocols/jabber/auth_cyrus.c
  patched  libpurple/protocols/jabber/auth_plain.c
  patched  libpurple/protocols/jabber/google/google_session.c
  patched  libpurple/protocols/jabber/jabber.h
  patched  libpurple/protocols/jabber/jingle/transport.c
  patched  pidgin/gtknotify.c
  patched  pidgin/gtkprefs.c