pidgin: 48c5c9c7: merge of '4108bfcdd43ec618a7105588ec476f...

[qulogic at pidgin.im]

-----------------------------------------------------------------
Revision: 48c5c9c72107408d63250fe0d7feb41f812a5d66
Ancestor: 4108bfcdd43ec618a7105588ec476f7cb3d68abb
Ancestor: b14102a6c681b35084d2c3f7726de34d4f859fe1
Author: qulogic at pidgin.im
Date: 2008-09-07T19:08:04
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/48c5c9c72107408d63250fe0d7feb41f812a5d66

Modified files:
        libpurple/plugins/autoaccept.c libpurple/protocols/msn/msn.c
        pidgin/gtkprefs.c

ChangeLog: 

merge of '4108bfcdd43ec618a7105588ec476f7cb3d68abb'
     and 'b14102a6c681b35084d2c3f7726de34d4f859fe1'