From: Boris Lytochkin <lytboris@php.net>
Date: Sat, 15 Jun 2013 20:04:00 +0000 (+0400)
Subject: Merge branch 'PHP-5.5' of https://git.php.net/push/php-src into PHP-5.5
X-Git-Tag: php-5.5.0~29
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=0741697107baefc39c3818f9a985c9c0f193e0d4;p=php

Merge branch 'PHP-5.5' of https://git.php.net/push/php-src into PHP-5.5

* 'PHP-5.5' of https://git.php.net/push/php-src: (147 commits)
  Fixed bug #63186 (compile failure on netbsd)
  fix test for bug #60322
  ensure the error_reporting level to get expected notice
  fixed tests
  missing tests for bug #53437
  fixed EOL
  added closing ?>
  fix double entry
  Merge branch 'pull-request/341'
  Merge branch 'pull-request/341'
  Merge branch 'pull-request/341'
  split the test for 32 and 64 bit
  typo fixes (argument)
  typo fixes (accommodate, parameter)
  missing colon
  Backported the fix for bug #53437
  Backported the fix for bug #53437
  fixed the test
  Fix a BC breach related to bug #53437
  Fixed bug #64988 (Class loading order affects E_STRICT warning)
  ...
---

0741697107baefc39c3818f9a985c9c0f193e0d4