Merge branch 'master' of git.openssl.org:openssl
authorRich Salz <rsalz@openssl.org>
Mon, 8 Sep 2014 14:44:07 +0000 (10:44 -0400)
committerRich Salz <rsalz@openssl.org>
Mon, 8 Sep 2014 14:46:05 +0000 (10:46 -0400)
commit76e8671c5a00f00abd75c9f5978c9eaee33709d3
tree1518e4d5e32c295ff40af46722f8f233a50b4103
parent4f13dabe72a43234435b96c8cbdaf77337e3532d
parentb0e659cfaca9ff4a481cc63b7f6b6e97303ad8fe
Merge branch 'master' of git.openssl.org:openssl

empty merge; script hiccup.

Reviewed-by: Dr. Stephen Henson <steve@openssl.org>