]> granicus.if.org Git - php/commitdiff
Merge branch 'openssl_error_store' into openssl_aead
authorJakub Zelenka <bukka@php.net>
Sun, 19 Jun 2016 16:36:57 +0000 (17:36 +0100)
committerJakub Zelenka <bukka@php.net>
Sun, 19 Jun 2016 16:36:57 +0000 (17:36 +0100)

Trivial merge