]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.6'
authorLior Kaplan <kaplanlior@gmail.com>
Thu, 13 Mar 2014 10:43:15 +0000 (12:43 +0200)
committerLior Kaplan <kaplanlior@gmail.com>
Thu, 13 Mar 2014 10:43:15 +0000 (12:43 +0200)
* PHP-5.6:
  Typo fix: sicret -> secret

1  2 
ext/openssl/openssl.c

Simple merge