pidgin: 727d816d: merge of 'ab4c3777bebccd93ded5d7e6886514...

[rlaager at pidgin.im]

-----------------------------------------------------------------
Revision: 727d816d20ca2bcfae91438cbd708b9f3d7de105
Ancestor: ab4c3777bebccd93ded5d7e6886514e95603f51a
Ancestor: cc84ce5643c451b4a6d379e839e7c7531cabd9ee
Author: rlaager at pidgin.im
Date: 2008-05-10T09:24:58
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/727d816d20ca2bcfae91438cbd708b9f3d7de105

Modified files:
        ChangeLog pidgin/gtkconn.c pidgin/gtkimhtmltoolbar.c

ChangeLog: 

merge of 'ab4c3777bebccd93ded5d7e6886514e95603f51a'
     and 'cc84ce5643c451b4a6d379e839e7c7531cabd9ee'