Merge remote-tracking branch 'origin/v0.8'
authorBen Noordhuis <info@bnoordhuis.nl>
Thu, 28 Feb 2013 22:13:54 +0000 (23:13 +0100)
committerBen Noordhuis <info@bnoordhuis.nl>
Thu, 28 Feb 2013 22:13:54 +0000 (23:13 +0100)
1  2 
tools/test.py

diff --cc tools/test.py
Simple merge