Viewing all changes in revision 561.2.1.

Committer: Stefano Rivera
Date: 2009-03-08 08:06:49 UTC
mfrom: <a title="Merged From 561.1.1" href="/~stefanor/ibid/exchange-336443/revision/561.1.1">(561.1.1 proxy-332804)
mto: <a title="Merged In 561.2.3" href="/~stefanor/ibid/exchange-336443/revision/561.2.3">(561.2.3 trunk)
mto: This revision was merged to the branch mainline in revision 565 .
Revision ID: stefano@rivera.za.net-20090308080649-u6bclmr25bhqcnv0

Merge proxy settings for http plugin.
https://code.edge.launchpad.net/~stefanor/ibid/proxy-332804/+merge/4268

added added

removed removed

~stefanor/ibid/exchange-336443