pidgin: 36a3c2db: merge of '074c5aedf9bbc512331f0d3130f076...

Sun May 24 00:00:43 EDT 2009

-----------------------------------------------------------------
Revision: 36a3c2dbfd6fbc5f74db055b56273d4c4d0e9c20
Ancestor: 074c5aedf9bbc512331f0d3130f076190b290676
Ancestor: 97fbf033d9afea69a6eabaac94698b3c051584cf
Author: rekkanoryo at pidgin.im
Date: 2009-05-24T03:55:27
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/36a3c2dbfd6fbc5f74db055b56273d4c4d0e9c20

Modified files:
        libpurple/protocols/jabber/jutil.c
        libpurple/protocols/jabber/jutil.h
        libpurple/protocols/oscar/oscar.c
        libpurple/protocols/yahoo/yahoo.h

ChangeLog: 

merge of '074c5aedf9bbc512331f0d3130f076190b290676'
     and '97fbf033d9afea69a6eabaac94698b3c051584cf'