pidgin: 7c3cd4e0: merge of '0a7239b54affab8c6c4a3a09756082...

[malu at pidgin.im]

----------------------------------------------------------------------
Revision: 7c3cd4e07a01085a68042131f5075778e65b1ab6
Parent:   0a7239b54affab8c6c4a3a097560826d888cf991
Parent:   f517ebc8991b2eeeae57b5bed9f2cef7899f60ba
Author:   malu at pidgin.im
Date:     06/30/10 17:34:50
Branch:   im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/7c3cd4e07a01085a68042131f5075778e65b1ab6

Changelog: 

merge of '0a7239b54affab8c6c4a3a097560826d888cf991'
     and 'f517ebc8991b2eeeae57b5bed9f2cef7899f60ba'

Changes against parent 0a7239b54affab8c6c4a3a097560826d888cf991

  patched  ChangeLog
  patched  libpurple/protocols/jabber/jabber.c
  patched  libpurple/protocols/jabber/namespaces.h
  patched  libpurple/protocols/jabber/si.c

Changes against parent f517ebc8991b2eeeae57b5bed9f2cef7899f60ba

  patched  finch/finch.c
  patched  finch/gntdebug.c
  patched  libpurple/connection.c
  patched  pidgin/gtkmain.c