From: Anatoliy Belsky <ab@php.net>
Date: Tue, 8 May 2012 16:15:19 +0000 (+0200)
Subject: Merge branch 'PHP-5.4'
X-Git-Tag: php-5.5.0alpha1~225
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=8c69c6c6b08421939a45de40182401f6a87c30d7;p=php

Merge branch 'PHP-5.4'

* PHP-5.4:
  Fix bug #61713 ext\standard\tests\strings\htmlentities10.phpt fails
---

8c69c6c6b08421939a45de40182401f6a87c30d7