pidgin: eca384d7: merge of '016f0a7edfb704950358fcccbf5098...

[qulogic at pidgin.im]

----------------------------------------------------------------------
Revision: eca384d7b17b6f95e4cc66ff2a25581cdbb8c424
Parent:   016f0a7edfb704950358fcccbf5098f0c6f7dac6
Parent:   489939aa338846decb86daa45569479f931422e4
Author:   qulogic at pidgin.im
Date:     09/18/11 05:11:02
Branch:   im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/eca384d7b17b6f95e4cc66ff2a25581cdbb8c424

Changelog: 

merge of '016f0a7edfb704950358fcccbf5098f0c6f7dac6'
     and '489939aa338846decb86daa45569479f931422e4'

Changes against parent 016f0a7edfb704950358fcccbf5098f0c6f7dac6

  patched  pidgin/gtkdialogs.c

Changes against parent 489939aa338846decb86daa45569479f931422e4

  patched  pidgin/gtkconv-theme-loader.c
  patched  pidgin/gtkconv-theme.c
  patched  pidgin/gtkconv-theme.h