]> granicus.if.org Git - php/commitdiff
projects / php / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: f0634b5 356c442)
Merge branch 'PHP-5.5' into PHP-5.6
authorLior Kaplan <kaplanlior@gmail.com>
Thu, 13 Mar 2014 10:41:48 +0000 (12:41 +0200)
committerLior Kaplan <kaplanlior@gmail.com>
Thu, 13 Mar 2014 10:41:48 +0000 (12:41 +0200)
* PHP-5.5:
  Typo fix: sicret -> secret

1  2 
ext/openssl/openssl.c patch | diff1 | diff2 | blob | history

diff --cc ext/openssl/openssl.c
Simple merge
Unnamed repository; edit this file 'description' to name the repository.