]> granicus.if.org Git - php/commit
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)
commitf120463efe073f61c4e8052eed36f3156e74f3f0
treedd6627ac3d8d4e6a43b36e52a46df729a79b2c8a
parentf0634b5be5010198998020fccbeaa36c2098ef13
parent356c442558661a2be00bfe7acd6a9abc4c7f97d0
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  Typo fix: sicret -> secret
ext/openssl/openssl.c