pidgin: acf4cce9: merge of '235259eaef44e8bacfe07e83eb5c66...

[maiku at pidgin.im]

-----------------------------------------------------------------
Revision: acf4cce929cd032affb8793d84b0506d8867e04c
Ancestor: 235259eaef44e8bacfe07e83eb5c66ddd4887ace
Ancestor: 2417ca53bef6c584fa8f1e7d5d205793a7091496
Author: maiku at pidgin.im
Date: 2009-08-12T10:04:54
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/acf4cce929cd032affb8793d84b0506d8867e04c

Modified files:
        ChangeLog.API doc/funniest_home_convos.txt libpurple/ft.c
        libpurple/ft.h libpurple/media.c libpurple/mediamanager.c
        libpurple/protocols/jabber/buddy.c
        libpurple/protocols/jabber/chat.c
        libpurple/protocols/jabber/iq.c
        libpurple/protocols/jabber/si.c
        libpurple/protocols/msn/msg.c libpurple/protocols/msn/slp.c
        libpurple/protocols/msn/slplink.c
        libpurple/protocols/msnp9/slplink.c pidgin/gtkimhtml.c
        pidgin/gtkmedia.c po/nn.po

ChangeLog: 

merge of '235259eaef44e8bacfe07e83eb5c66ddd4887ace'
     and '2417ca53bef6c584fa8f1e7d5d205793a7091496'