pidgin: 2cb4747b: merge of 'c7f2cce48dfe465889b7803de44156...

[qulogic at pidgin.im]

----------------------------------------------------------------------
Revision: 2cb4747b1d1df0ae4166e4631fef87cb95b6542a
Parent:   c7f2cce48dfe465889b7803de44156e7e89e41e0
Parent:   fafe54ad99f452f7b5d446e154440057c8863bd6
Author:   qulogic at pidgin.im
Date:     09/03/10 03:28:41
Branch:   im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/2cb4747b1d1df0ae4166e4631fef87cb95b6542a

Changelog: 

merge of 'c7f2cce48dfe465889b7803de44156e7e89e41e0'
     and 'fafe54ad99f452f7b5d446e154440057c8863bd6'

Changes against parent c7f2cce48dfe465889b7803de44156e7e89e41e0

  patched  libpurple/protocols/jabber/google/google_session.c
  patched  po/de.po

Changes against parent fafe54ad99f452f7b5d446e154440057c8863bd6

  patched  ChangeLog
  patched  libpurple/network.c
  patched  pidgin/plugins/vvconfig.c