pidgin: 3d0b8b35: merge of '7fd0d8c5830d11a8f34c0d2fa6a629...

[lschiere at pidgin.im]

-----------------------------------------------------------------
Revision: 3d0b8b3516bb5291c7ffde68712148c4efff27e7
Ancestor: 7fd0d8c5830d11a8f34c0d2fa6a6290427b182c4
Ancestor: cfa8bcce1dfa952cf5b50a0d15e1e15a63d1f120
Author: lschiere at pidgin.im
Date: 2008-05-14T11:57:02
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/3d0b8b3516bb5291c7ffde68712148c4efff27e7

Modified files:
        COPYRIGHT configure.ac libpurple/protocols/jabber/jabber.c
        pidgin/gtkblist.c

ChangeLog: 

merge of '7fd0d8c5830d11a8f34c0d2fa6a6290427b182c4'
     and 'cfa8bcce1dfa952cf5b50a0d15e1e15a63d1f120'