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

Trivial merge