Commits

Ian Bicking committed 7ddcd4e Merge

resolve merge

Comments (0)

Files changed (3)

 4b660247ce567c2afa83d066d90ec28f210bdaf4 1.3.4
 9a95f71c8cb21abef83c2313d21aeb5b0c5f41e3 1.4
 83a2465f6537595808bfdc12defa9ac81e66de5d 1.4.1
+041b8bc5aacfb9715e0f004d26132f6fdfec1790 1.4.2

docs/news.txt

File contents unchanged.

virtualenv.py

File contents unchanged.