pidgin: 0e28fcf0: merge of '0de80ccd44f6ce7fe6942baa1e0dfc...

[sadrul at pidgin.im]

-----------------------------------------------------------------
Revision: 0e28fcf0c7064b00d3ef3a9ffeaef0c0f8d98222
Ancestor: 0de80ccd44f6ce7fe6942baa1e0dfc95a2878d05
Ancestor: e7fb4056cfb091389c5c657b97f95365799165e6
Author: sadrul at pidgin.im
Date: 2008-06-03T05:12:51
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/0e28fcf0c7064b00d3ef3a9ffeaef0c0f8d98222

Modified files:
        libpurple/privacy.c libpurple/proxy.c

ChangeLog: 

merge of '0de80ccd44f6ce7fe6942baa1e0dfc95a2878d05'
     and 'e7fb4056cfb091389c5c657b97f95365799165e6'