pidgin: 88e9e59d: merge of '2b6c5a292658681aecfbe9f0c7f67c...

[qulogic at pidgin.im]

----------------------------------------------------------------------
Revision: 88e9e59d62fbafbf694c04a1d55f7acb5d797f55
Parent:   2b6c5a292658681aecfbe9f0c7f67cf62cfb28ec
Parent:   e010a6a5ac862c38a6a99db5b6981a985f9b7fb6
Author:   qulogic at pidgin.im
Date:     11/28/10 03:22:09
Branch:   im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/88e9e59d62fbafbf694c04a1d55f7acb5d797f55

Changelog: 

merge of '2b6c5a292658681aecfbe9f0c7f67cf62cfb28ec'
     and 'e010a6a5ac862c38a6a99db5b6981a985f9b7fb6'

Changes against parent 2b6c5a292658681aecfbe9f0c7f67cf62cfb28ec

  patched  ChangeLog
  patched  configure.ac
  patched  libpurple/mime.c
  patched  libpurple/protocols/gg/lib/dcc7.c
  patched  libpurple/protocols/gg/lib/events.c
  patched  libpurple/protocols/gg/lib/libgadu.c
  patched  libpurple/protocols/gg/lib/libgadu.h
  patched  libpurple/protocols/msn/msn.c
  patched  libpurple/protocols/msn/p2p.c
  patched  libpurple/protocols/msn/p2p.h
  patched  libpurple/protocols/msn/slpcall.c
  patched  libpurple/protocols/msn/slplink.c
  patched  libpurple/protocols/msn/user.c
  patched  libpurple/purple-remote

Changes against parent e010a6a5ac862c38a6a99db5b6981a985f9b7fb6

  patched  pidgin/gtkdialogs.c