Merge branch 'master' of openssl.net:openssl
authorBen Laurie <ben@links.org>
Sat, 19 Jan 2013 17:35:41 +0000 (17:35 +0000)
committerBen Laurie <ben@links.org>
Sat, 19 Jan 2013 17:35:41 +0000 (17:35 +0000)
1  2 
Configure
test/Makefile

diff --cc Configure
Simple merge
diff --cc test/Makefile
Simple merge