pidgin: 1a7a779b: merge of '6eb94bb98b242b76b07fe78fe89d13...

[sadrul at pidgin.im]

----------------------------------------------------------------------
Revision: 1a7a779bc2131e1ccb4153db0f799a791246c84b
Parent:   6eb94bb98b242b76b07fe78fe89d136b9201d6f1
Parent:   a61565c363dde22672cf7caafa30d1279ec84f33
Author:   sadrul at pidgin.im
Date:     07/12/10 11:15:18
Branch:   im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/1a7a779bc2131e1ccb4153db0f799a791246c84b

Changelog: 

merge of '6eb94bb98b242b76b07fe78fe89d136b9201d6f1'
     and 'a61565c363dde22672cf7caafa30d1279ec84f33'

Changes against parent 6eb94bb98b242b76b07fe78fe89d136b9201d6f1

  patched  libpurple/protocols/jabber/caps.c
  patched  libpurple/protocols/jabber/jabber.c
  patched  libpurple/protocols/jabber/jabber.h
  patched  libpurple/protocols/jabber/xdata.c
  patched  libpurple/protocols/jabber/xdata.h
  patched  libpurple/xmlnode.c
  patched  libpurple/xmlnode.h

Changes against parent a61565c363dde22672cf7caafa30d1279ec84f33

  patched  libpurple/upnp.c
  patched  libpurple/util.c