pidgin: 29b2294f: merge of '3b7b0deadf583b8df122dced7a6925...

[qulogic at pidgin.im]

-----------------------------------------------------------------
Revision: 29b2294f7cc9f0db7ade4615ae92c4788317fde0
Ancestor: 3b7b0deadf583b8df122dced7a6925e693af3223
Ancestor: d38b0e23fda81858ef7fe68e99d088fa1e83f02b
Author: qulogic at pidgin.im
Date: 2008-08-15T04:30:28
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/29b2294f7cc9f0db7ade4615ae92c4788317fde0

Renamed entries:
        pidgin/pixmaps/emotes/default/24/disapointed.png to pidgin/pixmaps/emotes/default/24/disappointed.png
        pidgin/pixmaps/emotes/default/24/scalable/disapointed.svg to pidgin/pixmaps/emotes/default/24/scalable/disappointed.svg
        pidgin/pixmaps/emotes/default/24/scalable/sigarette.svg to pidgin/pixmaps/emotes/default/24/scalable/cigarette.svg
Modified files:
        ChangeLog ChangeLog.API configure.ac
        libpurple/plugins/ssl/ssl-nss.c
        libpurple/protocols/msn/contact.c
        libpurple/protocols/msn/msn.c libpurple/protocols/msn/page.c
        libpurple/util.c libpurple/util.h
        pidgin/pixmaps/emotes/default/24/Makefile.am
        pidgin/pixmaps/emotes/default/24/scalable/cigarette.svg
        pidgin/pixmaps/emotes/default/24/scalable/disappointed.svg
        po/nl.po

ChangeLog: 

merge of '3b7b0deadf583b8df122dced7a6925e693af3223'
     and 'd38b0e23fda81858ef7fe68e99d088fa1e83f02b'