pidgin: 2cb1f6d6: merge of '7267766a0885d4724d8069fbe8b617...

Mon Aug 10 00:45:35 EDT 2009

-----------------------------------------------------------------
Revision: 2cb1f6d67d75d570e3c333f7d4055dd1ed953be4
Ancestor: 7267766a0885d4724d8069fbe8b617a51cccf64c
Ancestor: 914921bfe0d4ed0711648940bd871a18809ea203
Author: qulogic at pidgin.im
Date: 2009-08-10T04:40:54
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/2cb1f6d67d75d570e3c333f7d4055dd1ed953be4

Modified files:
        doc/funniest_home_convos.txt
        libpurple/protocols/jabber/presence.c
        libpurple/protocols/msn/msg.c libpurple/protocols/msn/slp.c
        pidgin/gtkimhtml.c pidgin/gtkmedia.c po/nn.po

ChangeLog: 

merge of '7267766a0885d4724d8069fbe8b617a51cccf64c'
     and '914921bfe0d4ed0711648940bd871a18809ea203'