im.pidgin.pidgin: 96bb0250f516ff49a03fcaa2b7720865d9668ccd

[elb at pidgin.im]

-----------------------------------------------------------------
Revision: 96bb0250f516ff49a03fcaa2b7720865d9668ccd
Ancestor: 37d10660345bc1f2092492296caa8deaf84744b4
Ancestor: 727439d778b7d7f40aa0230cb9be26765e8d50a9
Author: elb at pidgin.im
Date: 2007-11-28T02:54:31
Branch: im.pidgin.pidgin

Modified files:
        libpurple/plugins/ssl/ssl-gnutls.c
        libpurple/protocols/msn/notification.c
        libpurple/protocols/msnp9/msn.c
        libpurple/protocols/msnp9/user.c pidgin/gtkblist.c
        pidgin/plugins/convcolors.c pidgin/plugins/timestamp.c

ChangeLog: 

merge of '37d10660345bc1f2092492296caa8deaf84744b4'
     and '727439d778b7d7f40aa0230cb9be26765e8d50a9'