Merge remote-tracking branch 'origin/master' into fork_master
authorFilippo Valsorda <filippo.valsorda@gmail.com>
Thu, 29 Nov 2012 14:38:07 +0000 (15:38 +0100)
committerFilippo Valsorda <filippo.valsorda@gmail.com>
Thu, 29 Nov 2012 14:38:07 +0000 (15:38 +0100)
commit8192ebe1f874b22b0c27e675a4136a06e46a68ce
tree43e0feda4e3381d0c9455a7760093533d47145a5
parentcaaa47d37215f498c033afb42972c135be8138d4
parent20ba04267c3c2be27a766a43f34014012799b761
Merge remote-tracking branch 'origin/master' into fork_master

New tests - merged with md5 correction
test/gentests.py
test/test_download.py
test/tests.json