Merging with head
authorClaudio-Daniel Freire <claudio-daniel.freire@inria.fr>
Mon, 18 Jul 2011 11:29:18 +0000 (13:29 +0200)
committerClaudio-Daniel Freire <claudio-daniel.freire@inria.fr>
Mon, 18 Jul 2011 11:29:18 +0000 (13:29 +0200)
commit277594b4d7688b6a0c98e77d05e2211f35db641d
treea96d9625c60ca313a6c741a2977fb430f3281b04
parentcb044f8fd4cbf91f31ca8be0935a822f7c00ea1e
parent317d2721e82a8087145675c179b1e4c506f12059
Merging with head
src/nepi/util/proxy.py