pidgin: 3f4e56b4: merge of '5b4322528c199b000fbfc774bb782d...

Fri Apr 30 21:05:39 EDT 2010

-----------------------------------------------------------------
Revision: 3f4e56b46bba0b70c7230266e045f1744a84acae
Ancestor: 5b4322528c199b000fbfc774bb782dfd6dc0e2f2
Ancestor: c3825297241eefdff3ba2e08398ddfa301577a69
Author: darkrain42 at pidgin.im
Date: 2010-05-01T01:03:38
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/3f4e56b46bba0b70c7230266e045f1744a84acae

Modified files:
        ChangeLog.API libpurple/protocols/jabber/si.c
        libpurple/request.c libpurple/request.h
        libpurple/tests/test_util.c libpurple/util.c

ChangeLog: 

merge of '5b4322528c199b000fbfc774bb782dfd6dc0e2f2'
     and 'c3825297241eefdff3ba2e08398ddfa301577a69'