From: Anatoliy Belsky <ab@php.net>
Date: Tue, 24 Apr 2012 12:09:07 +0000 (+0200)
Subject: Merge branch 'PHP-5.4'
X-Git-Tag: php-5.5.0alpha1~269
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=117207121cd8e98549fb260a9e1ba142f31c7d42;p=php

Merge branch 'PHP-5.4'

* PHP-5.4:
  Fix bug #61413 ext\openssl\tests\openssl_encrypt_crash.phpt fails 5.3 only
---

117207121cd8e98549fb260a9e1ba142f31c7d42