pidgin: 2ba8d5be: merge of '2adbecd312414acb07814cfe297782...

[darkrain42 at pidgin.im]

-----------------------------------------------------------------
Revision: 2ba8d5be8f7a118488de29a6a54da206cce6662e
Ancestor: 2adbecd312414acb07814cfe297782c54ed76733
Ancestor: a613c27148476d6bdacf3acb6b9aee9f9084364a
Author: darkrain42 at pidgin.im
Date: 2009-08-31T03:43:30
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/2ba8d5be8f7a118488de29a6a54da206cce6662e

Modified files:
        ChangeLog libpurple/protocols/jabber/caps.c
        libpurple/protocols/jabber/jutil.c
        libpurple/protocols/jabber/jutil.h
        libpurple/protocols/jabber/roster.c po/de.po po/fi.po
        po/lt.po po/sv.po

ChangeLog: 

merge of '2adbecd312414acb07814cfe297782c54ed76733'
     and 'a613c27148476d6bdacf3acb6b9aee9f9084364a'