im.pidgin.pidgin: b5aed485a900449bbc77fa7182c02b18a2818bcc

[rekkanoryo at pidgin.im]

-----------------------------------------------------------------
Revision: b5aed485a900449bbc77fa7182c02b18a2818bcc
Ancestor: 3df0bc5b9537dc64833bb97fe2a03920e6f0c304
Ancestor: 7eccb0cdce9d646aacc309eaadcf48c6809fb7ce
Author: rekkanoryo at pidgin.im
Date: 2007-11-09T08:06:20
Branch: im.pidgin.pidgin

Modified files:
        libpurple/protocols/jabber/adhoccommands.c pidgin/gtkblist.c

ChangeLog: 

merge of '3df0bc5b9537dc64833bb97fe2a03920e6f0c304'
     and '7eccb0cdce9d646aacc309eaadcf48c6809fb7ce'