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)
empty merge; script hiccup.

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

Trivial merge