Merge with 3.4

d838911b · Zachary Ware · b6f8fec8 · 16e7f97b · d838911b
Commit d838911b authored Oct 25, 2014 by Zachary Ware
Show whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

PCbuild/readme.txt PCbuild/readme.txt +1 -1

No files found.
--- a/PCbuild/readme.txt
+++ b/PCbuild/readme.txt
@@ -214,7 +214,7 @@ _lzma
    Homepage:
        http://tukaani.org/xz/
 _ssl
-    Python wrapper for version 1.0.1h of the OpenSSL secure sockets
+    Python wrapper for version 1.0.1j of the OpenSSL secure sockets
    library, which is built by ssl.vcxproj
    Homepage:
        http://www.openssl.org/