pidgin: 226a30da: merge of '033dd646e39f8913f23a1536f8ff18...

Sun Feb 7 12:45:35 EST 2010

-----------------------------------------------------------------
Revision: 226a30da7a9fe3b828a1fe564797b3388e6159bc
Ancestor: 033dd646e39f8913f23a1536f8ff18c0489a8432
Ancestor: 8a8eea49a73487bb8550ba0ec70e444aaa6e2204
Author: markdoliner at pidgin.im
Date: 2010-02-07T17:43:30
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/226a30da7a9fe3b828a1fe564797b3388e6159bc

Modified files:
        pidgin/gtkconv.c pidgin/gtkdialogs.c po/ChangeLog po/ta.po

ChangeLog: 

merge of '033dd646e39f8913f23a1536f8ff18c0489a8432'
     and '8a8eea49a73487bb8550ba0ec70e444aaa6e2204'