Resolved conflict.
Merge branch 'PHP-5.4'

* PHP-5.4:
  Fixed bug61115-1.phpt for debug build version.
  Fixed bug #60718 Complie problem with libpq (PostgreSQL 7.3 or less)
Fix firebird bug #60947 , tested and now it prints the header page information from database
Merge branch 'PHP-5.3' into PHP-5.4

* PHP-5.3:
  Fix firebird bug #60947 , tested and now it prints the header page information from database
Merge branch 'PHP-5.4'

* PHP-5.4:
  Fix firebird bug #60947 , tested and now it prints the header page information from database
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:
  Fixed bug61115-1.phpt for debug build version.
  Fixed bug #60718 Complie problem with libpq (PostgreSQL 7.3 or less)
  Fixed bug #60718 Complie problem with libpq (PostgreSQL 7.3 or less)
  This will be PHP 5.3.12
  ext/pcntl/pcntl.c: Fix typo in comment
  Revert "ext/pcntl/pcntl.c: Fix typo in comment" (apply correct workflow)
  Revert "ext/pcntl/pcntl.c: Fix typo in comment" (apply correct workflow)
  ext/pcntl/pcntl.c: Fix typo in comment
  ext/pcntl/pcntl.c: Fix typo in comment
  - fix bug #61541, Segfault when using ob_* in output_callback
  - fix bug #61541, Segfault when using ob_* in output_callback
  update NEWS
  fix bug #61367 - open_basedir bypass using libxml RSHUTDOWN
  open_basedir check for linkinfo
  NEWS entry for readline fix
  NEWS entry for readline fix
  Add open_basedir checks to readline_write_history and readline_read_history
Merge branch 'master' of https://git.php.net/repository/php-src

* 'master' of https://git.php.net/repository/php-src:
  Fixed bug61115-1.phpt for debug build version.
  Fixed bug #60718 Complie problem with libpq (PostgreSQL 7.3 or less)
  Fixed bug #60718 Complie problem with libpq (PostgreSQL 7.3 or less)
  This will be PHP 5.3.12
  ext/pcntl/pcntl.c: Fix typo in comment
  Revert "ext/pcntl/pcntl.c: Fix typo in comment" (apply correct workflow)
  Revert "ext/pcntl/pcntl.c: Fix typo in comment" (apply correct workflow)
  Revert "Merge branch 'pull-request/24'" (apply correct workflow)
  ext/pcntl/pcntl.c: Fix typo in comment
  ext/pcntl/pcntl.c: Fix typo in comment
  - fix bug #61541, Segfault when using ob_* in output_callback
  - fix bug #61541, Segfault when using ob_* in output_callback
  ext/pcntl/pcntl.c: Fix typo in comment
  update NEWS
  fix bug #61367 - open_basedir bypass using libxml RSHUTDOWN
  open_basedir check for linkinfo
  NEWS entry for readline fix
  NEWS entry for readline fix
  Add open_basedir checks to readline_write_history and readline_read_history
fix makedist for new tags
Fix test,  parameter signatures was introduced only into 5.4
Merge branch 'PHP-5.3' into PHP-5.4

* PHP-5.3:
  Fix test,  parameter signatures was introduced only into 5.4
trivial change try to ci a "fake" merge

seems now a empty merge will not be accepted by pre-receive-hook
  "remote: We cannot figure out what you comitted!"
Merge branch 'PHP-5.4'

* PHP-5.4:
  trivial change try to ci a "fake" merge
  Fix test,  parameter signatures was introduced only into 5.4
  fix makedist for new tags
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:
  trivial change try to ci a "fake" merge
  Fix test,  parameter signatures was introduced only into 5.4
  fix makedist for new tags
Merge branch 'master' of https://git.php.net/repository/php-src

* 'master' of https://git.php.net/repository/php-src:
  trivial change try to ci a "fake" merge
  Fix test,  parameter signatures was introduced only into 5.4
  fix makedist for new tags
Add php.ini parameter checks for OCI8

Add tests for OCI8 php.ini parameters particularly to check
which parameters can be changes with ini_set().
Merge branch 'add-oci8-ini-tests' into PHP-5.3

* add-oci8-ini-tests:
  Add php.ini parameter checks for OCI8
Merge branch 'PHP-5.3' into PHP-5.4

* PHP-5.3:
  Add php.ini parameter checks for OCI8
Merge branch 'PHP-5.4'

* PHP-5.4:
  Add php.ini parameter checks for OCI8
Cleanup Safe Mode related comment in SG(request_info)
Merge branch 'PHP-5.3' into PHP-5.4

* PHP-5.3:
  Cleanup Safe Mode related comment in SG(request_info)