Merge branch 'PHP-5.4' into PHP-5.5
authorLior Kaplan <kaplanlior@gmail.com>
Sun, 17 Aug 2014 12:48:22 +0000 (15:48 +0300)
committerLior Kaplan <kaplanlior@gmail.com>
Sun, 17 Aug 2014 12:48:22 +0000 (15:48 +0300)
commitbe2128c8050fd8d22604acb0e225891551c81c8c
treea762e220562999130449272443fe9cde49ce9957
parent6279246d2c60437c583f9c273075579bf17be654
parent3f42f2f5d1c8026b6e1d21b91857a08d918c28c8
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  typofixes
acinclude.m4
ext/json/json.c
ext/mysqlnd/mysqlnd_result.c
ext/pcre/pcrelib/ChangeLog
ext/spl/php_spl.c
win32/build/confutils.js