pidgin: 75ec74ed: merge of '20112abca39ed1b5d1b36c259a68f5...

[qulogic at pidgin.im]

----------------------------------------------------------------------
Revision: 75ec74edcc85a4e376ccf3c424deb66d64db6ba9
Parent:   20112abca39ed1b5d1b36c259a68f54bcc9af09b
Parent:   d5ed69a6f4347d4c5debd460aea9b4fb6a9161e8
Author:   qulogic at pidgin.im
Date:     09/02/11 14:05:24
Branch:   im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/75ec74edcc85a4e376ccf3c424deb66d64db6ba9

Changelog: 

merge of '20112abca39ed1b5d1b36c259a68f54bcc9af09b'
     and 'd5ed69a6f4347d4c5debd460aea9b4fb6a9161e8'

Changes against parent 20112abca39ed1b5d1b36c259a68f54bcc9af09b

  dropped  pidgin/gtkdocklet-gtk.c
  patched  ChangeLog.API
  patched  pidgin/Makefile.am
  patched  pidgin/gtkcertmgr.c
  patched  pidgin/gtkconv.c
  patched  pidgin/gtkconv.h
  patched  pidgin/gtkdocklet.c
  patched  pidgin/gtkdocklet.h

Changes against parent d5ed69a6f4347d4c5debd460aea9b4fb6a9161e8

  patched  libpurple/plugins/perl/common/Status.xs