pidgin: a61565c3: merge of '188465fa1e8064c35ae348b4c71cee...

[darkrain42 at pidgin.im]

----------------------------------------------------------------------
Revision: a61565c363dde22672cf7caafa30d1279ec84f33
Parent:   188465fa1e8064c35ae348b4c71cee7fb4c7c755
Parent:   278c9cea4265f5e7877b2eaa47e5b44c049cf7f7
Author:   darkrain42 at pidgin.im
Date:     07/09/10 22:10:19
Branch:   im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/a61565c363dde22672cf7caafa30d1279ec84f33

Changelog: 

merge of '188465fa1e8064c35ae348b4c71cee7fb4c7c755'
     and '278c9cea4265f5e7877b2eaa47e5b44c049cf7f7'

Changes against parent 188465fa1e8064c35ae348b4c71cee7fb4c7c755

  patched  doc/finch.1.in

Changes against parent 278c9cea4265f5e7877b2eaa47e5b44c049cf7f7

  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