Merge branch 'master' of git.openssl.org:openssl
authorRich Salz <rsalz@akamai.com>
Tue, 26 Aug 2014 17:54:21 +0000 (13:54 -0400)
committerRich Salz <rsalz@akamai.com>
Tue, 26 Aug 2014 17:55:13 +0000 (13:55 -0400)
commited49eb4a48a11978d6ba8508fe9bae6794a20372
treea0eef8facd4ffd7455fa0a109d86e84c7d8370c1
parentfa60b909501664b2034d254781798e511d16c315
parenta4d266b82438ee9792d68dbe694170502e5e38da
Merge branch 'master' of git.openssl.org:openssl

Stupid git tricks :(

Reviewed-by: rsalz