granicus.if.org Git

]> granicus.if.org Git - php/log

projects / php / log

commit | commitdiff | tree

Stanislav Malyshev [Mon, 17 Jun 2013 07:42:36 +0000 (00:42 -0700)]

Merge branch 'PHP-5.5'

* PHP-5.5:
Tests: PDO Mysql - update for fixed getColumnMeta()
fix bug #48724

commit | commitdiff | tree

Stanislav Malyshev [Mon, 17 Jun 2013 07:41:46 +0000 (00:41 -0700)]

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
Tests: PDO Mysql - update for fixed getColumnMeta()
fix bug #48724

commit | commitdiff | tree

Daniel Beardsley [Wed, 2 Jan 2013 17:55:23 +0000 (10:55 -0700)]

Tests: PDO Mysql - update for fixed getColumnMeta()

The test has always been disabled... so it's never run anyway. Oh well.

commit | commitdiff | tree

Antony Dovgal [Fri, 13 Apr 2012 09:59:52 +0000 (13:59 +0400)]

fix bug #48724

PDO's getColumnMeta() doesn't return native_type for BIT, TINYINT and YEAR

commit | commitdiff | tree

Stanislav Malyshev [Mon, 17 Jun 2013 07:17:28 +0000 (00:17 -0700)]

Merge branch 'PHP-5.5'

* PHP-5.5:
  readline can output control codes
  Bug #55694: Update readline test to support attempted_completion_over variable
  Bug #55694: Expose attempted_completion_over variable from readline library

commit | commitdiff | tree

Stanislav Malyshev [Mon, 17 Jun 2013 07:15:59 +0000 (00:15 -0700)]

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  readline can output control codes
  Bug #55694: Update readline test to support attempted_completion_over variable
  Bug #55694: Expose attempted_completion_over variable from readline library

commit | commitdiff | tree

Stanislav Malyshev [Mon, 17 Jun 2013 07:15:31 +0000 (00:15 -0700)]

readline can output control codes

commit | commitdiff | tree

Hartmel [Tue, 28 May 2013 07:59:43 +0000 (09:59 +0200)]

Bug #55694: Update readline test to support attempted_completion_over variable

commit | commitdiff | tree

Hartmel [Mon, 27 May 2013 15:49:06 +0000 (17:49 +0200)]

Bug #55694: Expose attempted_completion_over variable from readline library

commit | commitdiff | tree

Xinchen Hui [Mon, 17 Jun 2013 05:25:04 +0000 (13:25 +0800)]

Merge branch 'PHP-5.5'

commit | commitdiff | tree

Xinchen Hui [Mon, 17 Jun 2013 05:23:24 +0000 (13:23 +0800)]

Merge branch 'PHP-5.4' into PHP-5.5

commit | commitdiff | tree

Xinchen Hui [Mon, 17 Jun 2013 05:22:20 +0000 (13:22 +0800)]

Fix typo in test

commit | commitdiff | tree

Stanislav Malyshev [Mon, 17 Jun 2013 01:14:32 +0000 (18:14 -0700)]

Merge branch 'PHP-5.5'

* PHP-5.5:
Identation Fixed
Identation Fixed

commit | commitdiff | tree

Stanislav Malyshev [Mon, 17 Jun 2013 01:14:16 +0000 (18:14 -0700)]

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
Identation Fixed

commit | commitdiff | tree

Jefersson Nathan [Mon, 1 Apr 2013 20:17:41 +0000 (17:17 -0300)]

Identation Fixed

commit | commitdiff | tree

Stanislav Malyshev [Mon, 17 Jun 2013 01:13:26 +0000 (18:13 -0700)]

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
Identation Fixed

commit | commitdiff | tree

Jefersson Nathan [Mon, 1 Apr 2013 20:17:41 +0000 (17:17 -0300)]

Identation Fixed

commit | commitdiff | tree

Stanislav Malyshev [Sun, 16 Jun 2013 23:56:38 +0000 (16:56 -0700)]

Merge branch 'PHP-5.5'

* PHP-5.5:
Fix bug #64764: Add status option to fpm init.d script

commit | commitdiff | tree

Stanislav Malyshev [Sun, 16 Jun 2013 23:55:18 +0000 (16:55 -0700)]

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
Fix bug #64764: Add status option to fpm init.d script

commit | commitdiff | tree

Lior Kaplan [Thu, 16 May 2013 16:46:53 +0000 (19:46 +0300)]

Fix bug #64764: Add status option to fpm init.d script

commit | commitdiff | tree

Stanislav Malyshev [Sun, 16 Jun 2013 23:41:37 +0000 (16:41 -0700)]

Merge branch 'PHP-5.5'

* PHP-5.5:
update NEWS

commit | commitdiff | tree

Stanislav Malyshev [Sun, 16 Jun 2013 23:41:23 +0000 (16:41 -0700)]

update NEWS

commit | commitdiff | tree

Stanislav Malyshev [Sun, 16 Jun 2013 23:40:56 +0000 (16:40 -0700)]

Merge branch 'PHP-5.5'

* PHP-5.5:
news for #64166

commit | commitdiff | tree

Stanislav Malyshev [Sun, 16 Jun 2013 23:40:52 +0000 (16:40 -0700)]

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
news for #64166

commit | commitdiff | tree

Stanislav Malyshev [Sun, 16 Jun 2013 23:40:39 +0000 (16:40 -0700)]

news for #64166

commit | commitdiff | tree

Stanislav Malyshev [Sun, 16 Jun 2013 23:39:06 +0000 (16:39 -0700)]

Merge branch 'PHP-5.5'

* PHP-5.5:
  add more tests for bug #64166
  Move unsigned char declaration to top of block
  trailing ws
  Fix #64166: quoted-printable-encode stream filter incorrectly discarding whitespace
  Fix #64166: quoted-printable-encode stream filter incorrectly discarding whitespace

commit | commitdiff | tree

Stanislav Malyshev [Sun, 16 Jun 2013 23:38:49 +0000 (16:38 -0700)]

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  add more tests for bug #64166
  Move unsigned char declaration to top of block
  trailing ws
  Fix #64166: quoted-printable-encode stream filter incorrectly discarding whitespace
  Fix #64166: quoted-printable-encode stream filter incorrectly discarding whitespace

commit | commitdiff | tree

Stanislav Malyshev [Sun, 16 Jun 2013 23:34:34 +0000 (16:34 -0700)]

add more tests for bug #64166

commit | commitdiff | tree

Michael M Slusarz [Mon, 18 Mar 2013 18:03:11 +0000 (12:03 -0600)]

Move unsigned char declaration to top of block

commit | commitdiff | tree

Michael M Slusarz [Mon, 18 Mar 2013 18:02:54 +0000 (12:02 -0600)]

trailing ws

commit | commitdiff | tree

Michael M Slusarz [Mon, 25 Feb 2013 01:34:35 +0000 (18:34 -0700)]

Fix #64166: quoted-printable-encode stream filter incorrectly discarding whitespace

Second attempt: need to use lookaheadto determine whether to encode ws

commit | commitdiff | tree

Michael M Slusarz [Thu, 7 Feb 2013 19:37:52 +0000 (12:37 -0700)]

Fix #64166: quoted-printable-encode stream filter incorrectly discarding whitespace

If trailing whitespace on a line is detected, mark the linebreak as a
soft linebreak.

commit | commitdiff | tree

Stanislav Malyshev [Sun, 16 Jun 2013 22:30:44 +0000 (15:30 -0700)]

Merge branch 'PHP-5.5'

* PHP-5.5:
Fix bug #64936 - clean doc comment state at the beginning and end of the scan
ws fix

commit | commitdiff | tree

Stanislav Malyshev [Sun, 16 Jun 2013 22:29:25 +0000 (15:29 -0700)]

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
Fix bug #64936 - clean doc comment state at the beginning and end of the scan
ws fix

Conflicts:
Zend/zend_language_scanner.c
Zend/zend_language_scanner.l
Zend/zend_language_scanner_defs.h

commit | commitdiff | tree

Stanislav Malyshev [Sun, 16 Jun 2013 22:02:51 +0000 (15:02 -0700)]

Fix bug #64936 - clean doc comment state at the beginning and end of the scan

commit | commitdiff | tree

Stanislav Malyshev [Sun, 16 Jun 2013 21:08:58 +0000 (14:08 -0700)]

ws fix

commit | commitdiff | tree

Anatol Belski [Sun, 16 Jun 2013 22:11:05 +0000 (00:11 +0200)]

Merge branch 'PHP-5.5'

* PHP-5.5:
fix test

commit | commitdiff | tree

Anatol Belski [Sun, 16 Jun 2013 22:10:32 +0000 (00:10 +0200)]

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
fix test

commit | commitdiff | tree

Anatol Belski [Sun, 16 Jun 2013 22:09:05 +0000 (00:09 +0200)]

fix test

breach introduced in ac40c0b562b0f90652cadef83968d7305626c377

commit | commitdiff | tree

Xinchen Hui [Sun, 16 Jun 2013 14:57:01 +0000 (22:57 +0800)]

Merge branch 'PHP-5.5'

commit | commitdiff | tree

Xinchen Hui [Sun, 16 Jun 2013 14:56:47 +0000 (22:56 +0800)]

Update NEWS

commit | commitdiff | tree

Xinchen Hui [Sun, 16 Jun 2013 14:56:22 +0000 (22:56 +0800)]

Merge branch 'PHP-5.4' into PHP-5.5

commit | commitdiff | tree

Xinchen Hui [Sun, 16 Jun 2013 14:55:59 +0000 (22:55 +0800)]

Fixed bug #63176 (Segmentation fault when instantiate 2 persistent PDO to the same db server)

commit | commitdiff | tree

Boris Lytochkin [Sat, 15 Jun 2013 20:10:06 +0000 (00:10 +0400)]

Merge branch 'PHP-5.5'

* PHP-5.5:
fix typo in test

commit | commitdiff | tree

Boris Lytochkin [Sat, 15 Jun 2013 20:09:55 +0000 (00:09 +0400)]

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
fix typo in test

commit | commitdiff | tree

Boris Lytochkin [Sat, 15 Jun 2013 20:09:18 +0000 (00:09 +0400)]

fix typo in test

commit | commitdiff | tree

Boris Lytochkin [Sat, 15 Jun 2013 20:04:22 +0000 (00:04 +0400)]

Merge branch 'master' of https://git.php.net/push/php-src

* 'master' of https://git.php.net/push/php-src: (171 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)
  ...

commit | commitdiff | tree

Boris Lytochkin [Sat, 15 Jun 2013 20:04:00 +0000 (00:04 +0400)]

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)
  ...

commit | commitdiff | tree

Boris Lytochkin [Sat, 15 Jun 2013 20:03:30 +0000 (00:03 +0400)]

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

* 'PHP-5.4' of https://git.php.net/push/php-src: (76 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
  fix double entry
  Merge branch 'pull-request/341'
  typo fixes (argument)
  typo fixes (accommodate, parameter)
  missing colon
  Backported the fix for bug #53437
  Backported the fix for bug #53437
  Fixed bug #64988 (Class loading order affects E_STRICT warning)
  Fixed test script
  PHPTests for the DOMDocument::loadHTMLfile method. They cover - The basic behaviour - When the method receives as argument a file which doesn't exist - When the argument is an empty string - When an empty file is loaded - When a not-well formed html file is loaded
  Fix spelling and correct typo.
  Callback has to be restored in MSHUTDOWN
  Update NEWs
  Fixed bug #64997 (Segfault while using RecursiveIteratorIterator on 64-bits systems)
  Fixed merge wrongly
  ...

commit | commitdiff | tree

Matteo Beccati [Fri, 14 Jun 2013 14:56:04 +0000 (16:56 +0200)]

Merge branch 'PHP-5.5'

* PHP-5.5:
Fixed bug #63186 (compile failure on netbsd)

commit | commitdiff | tree

Matteo Beccati [Fri, 14 Jun 2013 14:55:12 +0000 (16:55 +0200)]

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
Fixed bug #63186 (compile failure on netbsd)

commit | commitdiff | tree

Matteo Beccati [Fri, 14 Jun 2013 14:54:32 +0000 (16:54 +0200)]

Merge branch 'PHP-5.3' into PHP-5.4

* PHP-5.3:
Fixed bug #63186 (compile failure on netbsd)

commit | commitdiff | tree

Matteo Beccati [Fri, 14 Jun 2013 14:51:54 +0000 (16:51 +0200)]

Fixed bug #63186 (compile failure on netbsd)

commit | commitdiff | tree

Stanislav Malyshev [Thu, 13 Jun 2013 17:31:31 +0000 (10:31 -0700)]

Merge branch 'PHP-5.5'

* PHP-5.5:
fix test for bug #60322

commit | commitdiff | tree

Stanislav Malyshev [Thu, 13 Jun 2013 17:30:18 +0000 (10:30 -0700)]

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
fix test for bug #60322

commit | commitdiff | tree

Stanislav Malyshev [Thu, 13 Jun 2013 17:23:23 +0000 (10:23 -0700)]

fix test for bug #60322

commit | commitdiff | tree

Anatol Belski [Wed, 12 Jun 2013 11:15:32 +0000 (13:15 +0200)]

Merge branch 'PHP-5.5'

* PHP-5.5:
ensure the error_reporting level to get expected notice

commit | commitdiff | tree

Anatol Belski [Wed, 12 Jun 2013 11:15:18 +0000 (13:15 +0200)]

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
ensure the error_reporting level to get expected notice

commit | commitdiff | tree

Anatol Belski [Wed, 12 Jun 2013 11:14:53 +0000 (13:14 +0200)]

Merge branch 'PHP-5.3' into PHP-5.4

* PHP-5.3:
ensure the error_reporting level to get expected notice

commit | commitdiff | tree

Anatol Belski [Wed, 12 Jun 2013 11:13:48 +0000 (13:13 +0200)]

ensure the error_reporting level to get expected notice

commit | commitdiff | tree

Anatol Belski [Tue, 11 Jun 2013 10:40:30 +0000 (12:40 +0200)]

Merge branch 'PHP-5.5'

* PHP-5.5:
fixed tests

commit | commitdiff | tree

Anatol Belski [Tue, 11 Jun 2013 10:39:50 +0000 (12:39 +0200)]

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
fixed tests

commit | commitdiff | tree

Anatol Belski [Tue, 11 Jun 2013 10:39:28 +0000 (12:39 +0200)]

Merge branch 'PHP-5.3' into PHP-5.4

* PHP-5.3:
fixed tests

commit | commitdiff | tree

Anatol Belski [Tue, 11 Jun 2013 10:38:49 +0000 (12:38 +0200)]

fixed tests

commit | commitdiff | tree

Anatol Belski [Tue, 11 Jun 2013 09:24:33 +0000 (11:24 +0200)]

Merge branch 'PHP-5.5'

* PHP-5.5:
missing tests for bug #53437

commit | commitdiff | tree

Anatol Belski [Tue, 11 Jun 2013 09:24:16 +0000 (11:24 +0200)]

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
missing tests for bug #53437

commit | commitdiff | tree

Anatol Belski [Tue, 11 Jun 2013 09:22:55 +0000 (11:22 +0200)]

Merge branch 'PHP-5.3' into PHP-5.4

* PHP-5.3:
missing tests for bug #53437

commit | commitdiff | tree

Anatol Belski [Tue, 11 Jun 2013 09:19:57 +0000 (11:19 +0200)]

missing tests for bug #53437

commit | commitdiff | tree

Anatol Belski [Tue, 11 Jun 2013 06:33:19 +0000 (08:33 +0200)]

Merge branch 'PHP-5.5'

* PHP-5.5:
fixed EOL

commit | commitdiff | tree

Anatol Belski [Tue, 11 Jun 2013 06:32:54 +0000 (08:32 +0200)]

fixed EOL

commit | commitdiff | tree

Anatol Belski [Tue, 11 Jun 2013 06:26:07 +0000 (08:26 +0200)]

Merge branch 'PHP-5.5'

* PHP-5.5:
added closing ?>

commit | commitdiff | tree

Anatol Belski [Tue, 11 Jun 2013 06:25:38 +0000 (08:25 +0200)]

added closing ?>

commit | commitdiff | tree

Stanislav Malyshev [Tue, 11 Jun 2013 01:16:23 +0000 (18:16 -0700)]

Merge branch 'PHP-5.5'

* PHP-5.5:
fix double entry
Merge branch 'pull-request/341'

commit | commitdiff | tree

Stanislav Malyshev [Tue, 11 Jun 2013 01:16:09 +0000 (18:16 -0700)]

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
fix double entry
Merge branch 'pull-request/341'

commit | commitdiff | tree

Stanislav Malyshev [Tue, 11 Jun 2013 01:15:03 +0000 (18:15 -0700)]

fix double entry

commit | commitdiff | tree

Stanislav Malyshev [Mon, 10 Jun 2013 21:31:57 +0000 (14:31 -0700)]

Merge branch 'PHP-5.5'

* PHP-5.5:
Merge branch 'pull-request/341'
Merge branch 'pull-request/341'

commit | commitdiff | tree

Stanislav Malyshev [Mon, 10 Jun 2013 21:02:42 +0000 (14:02 -0700)]

Merge branch 'pull-request/341'

* pull-request/341: (23 commits)
typofixes

commit | commitdiff | tree

Stanislav Malyshev [Mon, 10 Jun 2013 21:20:18 +0000 (14:20 -0700)]

Merge branch 'pull-request/341'

* pull-request/341: (23 commits)
typofixes

commit | commitdiff | tree

Stanislav Malyshev [Mon, 10 Jun 2013 21:20:18 +0000 (14:20 -0700)]

Merge branch 'pull-request/341'

* pull-request/341: (23 commits)
typofixes

commit | commitdiff | tree

Anatol Belski [Mon, 10 Jun 2013 20:49:56 +0000 (22:49 +0200)]

Merge branch 'PHP-5.5'

* PHP-5.5:
split the test for 32 and 64 bit

commit | commitdiff | tree

Anatol Belski [Mon, 10 Jun 2013 20:49:30 +0000 (22:49 +0200)]

split the test for 32 and 64 bit

commit | commitdiff | tree

Stanislav Malyshev [Mon, 10 Jun 2013 20:37:56 +0000 (13:37 -0700)]

Merge branch 'PHP-5.5'

* PHP-5.5:
typo fixes (argument)
typo fixes (accommodate, parameter)

commit | commitdiff | tree

Stanislav Malyshev [Mon, 10 Jun 2013 20:36:41 +0000 (13:36 -0700)]

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
typo fixes (argument)
typo fixes (accommodate, parameter)

commit | commitdiff | tree

Veres Lajos [Mon, 22 Apr 2013 13:05:24 +0000 (14:05 +0100)]

typo fixes (argument)

commit | commitdiff | tree

Veres Lajos [Mon, 22 Apr 2013 12:41:27 +0000 (13:41 +0100)]

typo fixes (accommodate, parameter)

commit | commitdiff | tree

Anatol Belski [Mon, 10 Jun 2013 17:55:51 +0000 (19:55 +0200)]

Merge branch 'PHP-5.5'

* PHP-5.5:
missing colon

commit | commitdiff | tree

Anatol Belski [Mon, 10 Jun 2013 17:55:30 +0000 (19:55 +0200)]

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
missing colon

commit | commitdiff | tree

Anatol Belski [Mon, 10 Jun 2013 17:55:06 +0000 (19:55 +0200)]

Merge branch 'PHP-5.3' into PHP-5.4

* PHP-5.3:
missing colon

commit | commitdiff | tree

Anatol Belski [Mon, 10 Jun 2013 17:54:29 +0000 (19:54 +0200)]

missing colon

commit | commitdiff | tree

Anatol Belski [Mon, 10 Jun 2013 17:53:27 +0000 (19:53 +0200)]

Merge branch 'PHP-5.5'

* PHP-5.5:
Backported the fix for bug #53437
Backported the fix for bug #53437

commit | commitdiff | tree

Anatol Belski [Mon, 10 Jun 2013 17:53:03 +0000 (19:53 +0200)]

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
Backported the fix for bug #53437
Backported the fix for bug #53437

commit | commitdiff | tree

Anatol Belski [Mon, 10 Jun 2013 17:52:29 +0000 (19:52 +0200)]

Backported the fix for bug #53437

commit | commitdiff | tree

Anatol Belski [Mon, 10 Jun 2013 17:49:31 +0000 (19:49 +0200)]

Merge branch 'PHP-5.3' into PHP-5.4

* PHP-5.3:
Backported the fix for bug #53437

commit | commitdiff | tree

Anatol Belski [Mon, 10 Jun 2013 17:48:18 +0000 (19:48 +0200)]

Backported the fix for bug #53437

commit | commitdiff | tree

Anatol Belski [Mon, 10 Jun 2013 16:31:40 +0000 (18:31 +0200)]

Merge branch 'PHP-5.5'

* PHP-5.5:
fixed the test

commit | commitdiff | tree

Anatol Belski [Mon, 10 Jun 2013 16:31:18 +0000 (18:31 +0200)]

fixed the test

commit | commitdiff | tree

Anatol Belski [Mon, 10 Jun 2013 15:50:13 +0000 (17:50 +0200)]

Merge branch 'PHP-5.5'

* PHP-5.5:
Fix a BC breach related to bug #53437

commit | commitdiff | tree

Anatol Belski [Mon, 10 Jun 2013 15:48:13 +0000 (17:48 +0200)]

Fix a BC breach related to bug #53437

days and special_amount properties are exported as int again

commit | commitdiff | tree

Xinchen Hui [Mon, 10 Jun 2013 13:33:47 +0000 (21:33 +0800)]

Merge branch 'PHP-5.5'

commit | commitdiff | tree

Xinchen Hui [Mon, 10 Jun 2013 13:31:25 +0000 (21:31 +0800)]

Merge branch 'PHP-5.4' into PHP-5.5

Conflicts:
Zend/zend_compile.c

Unnamed repository; edit this file 'description' to name the repository.

RSS Atom