From: Anatoliy Belsky <ab@php.net>
Date: Mon, 16 Apr 2012 11:42:52 +0000 (+0200)
Subject: Merge branch 'PHP-5.3' into PHP-5.4
X-Git-Tag: php-5.4.4RC1~118
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=ede519d1d699dc638757f559f91a5dd93967d2b8;p=php

Merge branch 'PHP-5.3' into PHP-5.4

* PHP-5.3:
  Fix bug 61676 ext\tidy\tests\bug54682.phpt fails

Conflicts:
	ext/tidy/tests/bug54682.phpt
---

ede519d1d699dc638757f559f91a5dd93967d2b8