From: Pierre Joye <pierre.php@gmail.com>
Date: Wed, 28 Mar 2012 00:11:06 +0000 (+0200)
Subject: Merge branch 'PHP-5.3' into PHP-5.4
X-Git-Tag: php-5.4.1RC1~13
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=c195596280c2e48f68b6c1c97215b8c4417e2274;p=php

Merge branch 'PHP-5.3' into PHP-5.4

* PHP-5.3:
  - fix bug #61504, fix build errors on windows and possibly other

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

c195596280c2e48f68b6c1c97215b8c4417e2274