From: Christopher Jones <sixd@php.net>
Date: Tue, 1 May 2012 21:47:18 +0000 (-0700)
Subject: Merge branch 'PHP-5.4'
X-Git-Tag: php-5.5.0alpha1~245
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=f2e81779a70a7202df38084bbcb4f0a81397cbda;p=php

Merge branch 'PHP-5.4'

* PHP-5.4:
  Fix masking in bug61115-1.phpt

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

f2e81779a70a7202df38084bbcb4f0a81397cbda