From: Anatoliy Belsky <ab@php.net>
Date: Tue, 27 Mar 2012 13:34:57 +0000 (+0200)
Subject: Merge branch '5.4'
X-Git-Tag: php-5.5.0alpha1~383
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=686effc6776f10c8b3192a4da84ccf06649955f4;p=php

Merge branch '5.4'

* 5.4:
  Fix bug #61412 ext\openssl\tests\bug28382.phpt fails
---

686effc6776f10c8b3192a4da84ccf06649955f4