tests/test-merge4.out
author Benoit Boissinot <benoit.boissinot@ens-lyon.org>
Wed, 10 Feb 2010 20:08:18 +0100
changeset 10408 50fb1fe143ff
parent 6336 4b0c9c674707
permissions -rw-r--r--
url: httplib.HTTPSConnection already handles IPv6 and port parsing fine

0 files updated, 0 files merged, 1 files removed, 0 files unresolved
created new head
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)