pidgin: cf7cc1ec: merge of '994f8bdccfcf73a73924e593d2c398...

[deryni at pidgin.im]

-----------------------------------------------------------------
Revision: cf7cc1ec422b7506be056f4d614cbb38856f7f8c
Ancestor: 994f8bdccfcf73a73924e593d2c398c8d416e5e9
Ancestor: 9d2e66fa6a8265d3cffb16f084ddb39903e0a36c
Author: deryni at pidgin.im
Date: 2008-05-14T03:32:10
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/cf7cc1ec422b7506be056f4d614cbb38856f7f8c

Modified files:
        ChangeLog configure.ac finch/gntsound.c libpurple/blist.c
        libpurple/prefs.h libpurple/protocols/jabber/chat.c
        libpurple/protocols/msn/notification.c
        libpurple/protocols/msn/session.c
        libpurple/protocols/msnp9/notification.c
        libpurple/protocols/msnp9/session.c
        libpurple/protocols/simple/simple.c pidgin/gtkblist.c
        pidgin/plugins/history.c po/hu.po

ChangeLog: 

merge of '994f8bdccfcf73a73924e593d2c398c8d416e5e9'
     and '9d2e66fa6a8265d3cffb16f084ddb39903e0a36c'