pidgin: 093fabeb: merge of '27269c5b28fd1f58228c46b310d26a...

[nosnilmot at pidgin.im]

-----------------------------------------------------------------
Revision: 093fabeb213db609020570b5159584718eda874a
Ancestor: 27269c5b28fd1f58228c46b310d26a5d208dac77
Ancestor: 8bae3778af422c41094db4e639f2cf45e6ee6259
Author: nosnilmot at pidgin.im
Date: 2008-08-15T02:44:36
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/093fabeb213db609020570b5159584718eda874a

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 libpurple/plugins/ssl/ssl-nss.c
        libpurple/protocols/msn/contact.c
        libpurple/protocols/msn/msn.c libpurple/protocols/msn/page.c
        libpurple/protocols/msn/slplink.c
        libpurple/protocols/msn/switchboard.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 '27269c5b28fd1f58228c46b310d26a5d208dac77'
     and '8bae3778af422c41094db4e639f2cf45e6ee6259'