pidgin: 1e2365e0: merge of '7c3cd4e07a01085a68042131f50757...

[malu at pidgin.im]

----------------------------------------------------------------------
Revision: 1e2365e0d77dd8de9ad8162e88e4166a2fdefcfd
Parent:   7c3cd4e07a01085a68042131f5075778e65b1ab6
Parent:   bc180436ff3297311929813e3dc6a1a77baa8817
Author:   malu at pidgin.im
Date:     06/30/10 17:38:27
Branch:   im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/1e2365e0d77dd8de9ad8162e88e4166a2fdefcfd

Changelog: 

merge of '7c3cd4e07a01085a68042131f5075778e65b1ab6'
     and 'bc180436ff3297311929813e3dc6a1a77baa8817'

Changes against parent 7c3cd4e07a01085a68042131f5075778e65b1ab6

  patched  pidgin/gtkprefs.c

Changes against parent bc180436ff3297311929813e3dc6a1a77baa8817

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