]> granicus.if.org Git - php/commitdiff
Merge branch '5.4'
authorAnatoliy Belsky <ab@php.net>
Tue, 27 Mar 2012 14:32:14 +0000 (16:32 +0200)
committerAnatoliy Belsky <ab@php.net>
Tue, 27 Mar 2012 14:32:14 +0000 (16:32 +0200)
* 5.4:
  Fix bug #61405 ext\openssl\tests\022.phpt fails
  Fix bug #61412 ext\openssl\tests\bug28382.phpt fails
  Fix bug #61412 ext\openssl\tests\bug28382.phpt fails


Trivial merge