]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.4'
authorAnatoliy Belsky <ab@php.net>
Tue, 24 Apr 2012 12:09:07 +0000 (14:09 +0200)
committerAnatoliy Belsky <ab@php.net>
Tue, 24 Apr 2012 12:09:07 +0000 (14:09 +0200)
* PHP-5.4:
  Fix bug #61413 ext\openssl\tests\openssl_encrypt_crash.phpt fails 5.3 only


Trivial merge