Merge branch 'master' of git.openssl.org:openssl
authorRich Salz <rsalz@openssl.org>
Tue, 9 Sep 2014 21:06:40 +0000 (17:06 -0400)
committerRich Salz <rsalz@openssl.org>
Tue, 9 Sep 2014 21:06:50 +0000 (17:06 -0400)
commitc939cca1a351711a6c8f017f216916c10c7a1559
treef79ebedd62752165e64b5d4b850ad94bd28fb53b
parent843921f29864aae71d360803d355e8f22cdcf822
parentb999f66e34d19ae4d81263bc96b8b8d548d2e13c
Merge branch 'master' of git.openssl.org:openssl

Previous commit was reviewed by Geoff, not Stephen:
Reviewed-by: Geoff Thorpe <geoff@openssl.org>