I forgot that inconsistent is only avaliable in debug mode
Fixed bug #63055 (Segfault in zend_gc with SF2 testsuite)
Merge branch 'PHP-5.3' into PHP-5.4
better fix for #63055
Merge branch 'PHP-5.3' into PHP-5.4
indent
Merge branch 'PHP-5.3' into PHP-5.4
Merge the fix for #61964 to 5.3, which will fix #63304
Merge branch 'PHP-5.3' into PHP-5.4
SUpport newer bisons.
Merge branch 'PHP-5.3' into PHP-5.4

Conflicts:
	Zend/acinclude.m4
- Updated to version 2012.7 (2012g)
Merge branch 'PHP-5.3' into PHP-5.4
Fixed bug #63265 (Add ORA-00028 to the PHP_OCI_HANDLE_ERROR macro)

Improve high availability for explicitly terminated connections.
Merge branch 'PHP-5.3' of https://git.php.net/repository/php-src into PHP-5.3

* 'PHP-5.3' of https://git.php.net/repository/php-src:
  - Updated to version 2012.7 (2012g)
  SUpport newer bisons.
  Merge the fix for #61964 to 5.3, which will fix #63304
  indent
  better fix for #63055
  Fixed bug #63055 (Segfault in zend_gc with SF2 testsuite)
  PHP 5.3.18 NEWS
  fix NEWS
  fix compilation failure on 32/64bit linux systems, when libmysql is used  with ext/mysql
  Cover have_ssl=NO and have_ssl=DISABLED
  Minor changes for MySQL 5.6
  NEWS for 76601c4
  Fix bug #63240 on stream_get_line()
  extended the SKIPIF section with ICU 49 (sync with 5.4 branch)
  fixed tests for gd having freetype >= 2.4.10
Merge branch 'PHP-5.4' of https://git.php.net/repository/php-src into PHP-5.4

* 'PHP-5.4' of https://git.php.net/repository/php-src: (22 commits)
  - Updated to version 2012.7 (2012g)
  SUpport newer bisons.
  Merge the fix for #61964 to 5.3, which will fix #63304
  indent
  better fix for #63055
  Fixed bug #63055 (Segfault in zend_gc with SF2 testsuite)
  I forgot that inconsistent is only avaliable in debug mode
  Add comments
  Fixed bug #63055 (Segfault in zend_gc with SF2 testsuite)
  PHP 5.3.18 NEWS
  fix NEWS
  fix compilation failure on 32/64bit linux systems, when libmysql is used  with ext/mysql
  Fixed bug #63248 Load multiple magic files on win
  Cover have_ssl=NO and have_ssl=DISABLED
  - BFN
  - Fixed bug #63214 (Large PDO Firebird Queries)
  Fix bug #63240 on stream_get_line()
  extended the SKIPIF section with ICU 49 (sync with 5.4 branch)
  fixed tests for gd having freetype >= 2.4.10
  Fixed bug #63258 (seg fault with PDO and dblib using DBSETOPT(H->link, DBQUOTEDIDENT, 1))
  ...
Fixed bug #63307 (Unused variable in oci8.c)

An output section for oci_internal_debug() was setting but not using a variable
Merge branch 'PHP-5.3' into PHP-5.4

* PHP-5.3:
  Fixed bug #63307 (Unused variable in oci8.c)
  Fixed bug #63265 (Add ORA-00028 to the PHP_OCI_HANDLE_ERROR macro)
Add fix & missing fix
Merge branch 'PHP-5.3' into PHP-5.4

* PHP-5.3:
  Add fix & missing fix