Merge branch 'no_gmt_unix_time' of git://github.com/nmathewson/openssl into OpenSSL_1...
authorBen Laurie <ben@links.org>
Sat, 19 Oct 2013 10:46:32 +0000 (11:46 +0100)
committerBen Laurie <ben@links.org>
Sat, 19 Oct 2013 10:46:32 +0000 (11:46 +0100)
1  2 
ssl/d1_srvr.c
ssl/ssl.h

diff --cc ssl/d1_srvr.c
Simple merge
diff --cc ssl/ssl.h
Simple merge