pidgin: 0bb56c61: merge of '147a2b8b067bccc514ecf55f2a4454...

[qulogic at pidgin.im]

-----------------------------------------------------------------
Revision: 0bb56c61f60a93fff0f712dbb59d3461f474b2db
Ancestor: 147a2b8b067bccc514ecf55f2a4454f6df40e9bb
Ancestor: 3b462776d19577ac9844ac289becb8e1626d9dd9
Author: qulogic at pidgin.im
Date: 2010-02-07T08:43:26
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/0bb56c61f60a93fff0f712dbb59d3461f474b2db

Added files:
        po/or.po
Modified files:
        ChangeLog configure.ac
        libpurple/protocols/oscar/family_oservice.c pidgin/gtkconv.c
        pidgin/gtkdialogs.c pidgin/gtkimhtml.c pidgin/gtksmiley.c
        pidgin/gtksmiley.h po/ChangeLog po/pa.po po/ru.po

ChangeLog: 

merge of '147a2b8b067bccc514ecf55f2a4454f6df40e9bb'
     and '3b462776d19577ac9844ac289becb8e1626d9dd9'