From: Anatoliy Belsky <ab@php.net>
Date: Mon, 30 Apr 2012 15:31:31 +0000 (+0200)
Subject: Merge branch 'PHP-5.4'
X-Git-Tag: php-5.5.0alpha1~249
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=8382da04923aae8abb70c1f4445e464345caa63a;p=php

Merge branch 'PHP-5.4'

* PHP-5.4:
  Fix bug 61868 ext\dom\tests\DOMDocument_validate_on_parse_variation.phpt fails
  - Regenerated files

Conflicts:
	Zend/zend_language_scanner.c
	Zend/zend_language_scanner_defs.h
---

8382da04923aae8abb70c1f4445e464345caa63a