pidgin: 538b851a: merge of '2efa9b7fc41104668975df54e8be8a...

[darkrain42 at pidgin.im]

----------------------------------------------------------------------
Revision: 538b851ae7c6466621d0c3caa2e13a8a9097cf02
Parent:   2efa9b7fc41104668975df54e8be8a7171383794
Parent:   88aea2f701d6cff5efc151d40ef06257da67cf3d
Author:   darkrain42 at pidgin.im
Date:     01/10/11 00:20:06
Branch:   im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/538b851ae7c6466621d0c3caa2e13a8a9097cf02

Changelog: 

merge of '2efa9b7fc41104668975df54e8be8a7171383794'
     and '88aea2f701d6cff5efc151d40ef06257da67cf3d'

Changes against parent 2efa9b7fc41104668975df54e8be8a7171383794

  added    share/ca-certs/AddTrust_External_Root.pem
  patched  ChangeLog
  patched  libpurple/protocols/jabber/bosh.c
  patched  pidgin/win32/nsis/pidgin-installer.nsi
  patched  share/ca-certs/Makefile.am

Changes against parent 88aea2f701d6cff5efc151d40ef06257da67cf3d

  patched  COPYRIGHT
  patched  ChangeLog
  patched  configure.ac
  patched  libpurple/protocols/msn/error.c
  patched  libpurple/protocols/novell/novell.c
  patched  libpurple/protocols/zephyr/zephyr.c