pidgin: 564a94f7: merge of '37d6f8af593bffa17bba1823a3c5a8...

[elb at pidgin.im]

-----------------------------------------------------------------
Revision: 564a94f78d4c820f8f76fc5d439d639d43fc5b13
Ancestor: 37d6f8af593bffa17bba1823a3c5a8612bcfdf18
Ancestor: 6f293106dd16191e1ee2fd0ae94ab626d6753c98
Author: elb at pidgin.im
Date: 2008-04-12T20:20:09
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/564a94f78d4c820f8f76fc5d439d639d43fc5b13

Modified files:
        ChangeLog libpurple/protocols/irc/msgs.c libpurple/status.c
        libpurple/status.h pidgin/gtkconv.c

ChangeLog: 

merge of '37d6f8af593bffa17bba1823a3c5a8612bcfdf18'
     and '6f293106dd16191e1ee2fd0ae94ab626d6753c98'