Merge remote-tracking branch 'php/master'

Conflicts:
	ext/date/lib/parse_date.c

diff --cc Zend/zend_compile.c
index 120cc98da5104325544b0eb2a693a0a4bdd744aa,35761ecec0e7976b55a0614a0e1e7c138aad0bad..b15548a27f319c1b90c8cfed4b247d993c2acf0b
--- 1/Zend/zend_compile.c
--- 2/Zend/zend_compile.c
+++ b/Zend/zend_compile.c
@@@ -1845,9 -1845,9 +1845,9 @@@ void zend_do_receive_param(zend_uchar o
                Z_STR(varname->u.constant) = CG(active_op_array)->vars[EX_VAR_TO_NUM(var.u.op.var)];
                var.EA = 0;
                if (EX_VAR_TO_NUM(var.u.op.var) != CG(active_op_array)->num_args) {
-                       zend_error_noreturn(E_COMPILE_ERROR, "Redefinition of parameter %s", Z_STRVAL(varname->u.constant));
+                       zend_error_noreturn(E_COMPILE_ERROR, "Redefinition of parameter $%s", Z_STRVAL(varname->u.constant));
                } else if (Z_STRHASH(varname->u.constant) == THIS_HASHVAL &&
 -                      Z_STRLEN(varname->u.constant) == sizeof("this")-1 &&
 +                      Z_STRSIZE(varname->u.constant) == sizeof("this")-1 &&
                    !memcmp(Z_STRVAL(varname->u.constant), "this", sizeof("this")-1)) {
                        if (CG(active_op_array)->scope &&
                            (CG(active_op_array)->fn_flags & ZEND_ACC_STATIC) == 0) {

diff --cc Zend/zend_execute_API.c
Simple merge

diff --cc ext/date/lib/parse_date.c
index 6849fa9385911e7b4cffd6f2b5dbc67c16e90079,fbc76402abbab622ef0cfef44e84c5dc44cbb487..ad9727d1975bd72f0d1d8395dd9b58047ad9c389
--- 1/ext/date/lib/parse_date.c
--- 2/ext/date/lib/parse_date.c
+++ b/ext/date/lib/parse_date.c
@@@ -1,4 -1,5 +1,5 @@@
- /* Generated by re2c 0.13.5 on Thu Jul 31 14:33:37 2014 */
 -/* Generated by re2c 0.13.5 on Mon Aug 18 18:28:27 2014 */
++/* Generated by re2c 0.13.5 on Tue Aug 19 08:27:07 2014 */
+ #line 1 "ext/date/lib/parse_date.re"
  /*
     +----------------------------------------------------------------------+
     | PHP Version 5                                                        |

diff --cc ext/openssl/xp_ssl.c
Simple merge

diff --cc ext/sqlite3/sqlite3.c
Simple merge

diff --cc ext/standard/array.c
Simple merge

diff --cc ext/xml/xml.c
Simple merge

diff --cc ext/xmlrpc/xmlrpc-epi-php.c
Simple merge