pidgin: 1f0f6668: merge of 'd3c4fbebab720da0885766add6272f...

Thu Feb 23 04:06:04 EST 2012

----------------------------------------------------------------------
Revision: 1f0f6668f717ec38867fefb63b5b5f3a85f71256
Parent:   d3c4fbebab720da0885766add6272f14814edc99
Parent:   deb06ab6aa118efb674f1a8434ff529e67b28809
Author:   qulogic at pidgin.im
Date:     02/23/12 04:01:12
Branch:   im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/1f0f6668f717ec38867fefb63b5b5f3a85f71256

Changelog: 

merge of 'd3c4fbebab720da0885766add6272f14814edc99'
     and 'deb06ab6aa118efb674f1a8434ff529e67b28809'

Changes against parent d3c4fbebab720da0885766add6272f14814edc99

  patched  ChangeLog
  patched  pidgin/gtkconv.c
  patched  pidgin/gtkdialogs.c
  patched  pidgin/gtkprefs.c
  patched  pidgin/gtkwebview.c

Changes against parent deb06ab6aa118efb674f1a8434ff529e67b28809

  patched  ChangeLog