delta/php-git.git, branch php-5.5.29 git.php.net: repository/php-src.git Merge branch 'PHP-5.4' into PHP-5.5 2015-09-02T16:00:35+00:00 Julien Pauli jpauli@php.net 2015-09-02T15:55:20+00:00 46370d548b7803ca38901fe5839e18a3ab93aab5 * PHP-5.4: Merge branch 'PHP-5.6' bump version Conflicts: configure.in main/php_version.h 
* PHP-5.4:
  Merge branch 'PHP-5.6'
  bump version

Conflicts:
	configure.in
	main/php_version.h
prepare for 5.5.29 2015-09-02T15:39:30+00:00 Julien Pauli jpauli@php.net 2015-09-02T15:39:30+00:00 58b8d9d27eb2bcdf5de2197bbd80949c05ecb88d 






Merge branch 'PHP-5.5' into PHP-5.5.29
2015-09-01T19:24:06+00:00

Stanislav Malyshev
stas@php.net

2015-09-01T19:24:06+00:00

43c2dfa7b3c0e42ddd8f181200ea34bdb7b8cfd0

* PHP-5.5:
  fix unit tests





* PHP-5.5:
  fix unit tests







Merge branch 'PHP-5.4' into PHP-5.5
2015-09-01T19:23:55+00:00

Stanislav Malyshev
stas@php.net

2015-09-01T19:23:55+00:00

4aeff30337d7357a76425ab5c2c5a70af879c8ad

* PHP-5.4:
  fix unit tests





* PHP-5.4:
  fix unit tests







fix unit tests
2015-09-01T19:23:22+00:00

Stanislav Malyshev
stas@php.net

2015-09-01T19:23:22+00:00

1922c650bac7ca4aed9c530faddb96cff73a0abc












Merge branch 'PHP-5.5' into PHP-5.5.29
2015-09-01T19:04:04+00:00

Stanislav Malyshev
stas@php.net

2015-09-01T19:04:04+00:00

32fe02c27da068af74025a12166e6c466311222e

* PHP-5.5:
  update NEWS
  add NEWS for fixes





* PHP-5.5:
  update NEWS
  add NEWS for fixes







update NEWS
2015-09-01T19:03:48+00:00

Stanislav Malyshev
stas@php.net

2015-09-01T19:03:48+00:00

31b634bf7cb8e3de1dfa71418e348133c2365933












Merge branch 'PHP-5.4' into PHP-5.5
2015-09-01T19:00:30+00:00

Stanislav Malyshev
stas@php.net

2015-09-01T19:00:30+00:00

0fac73a3bf759b8f15db5714572738ff79c9e84b

* PHP-5.4:
  add NEWS for fixes





* PHP-5.4:
  add NEWS for fixes







add NEWS for fixes
2015-09-01T18:53:59+00:00

Stanislav Malyshev
stas@php.net

2015-09-01T18:53:59+00:00

7ceb0e3a186782ba007dfd4e867d7eed70437740












Merge branch 'PHP-5.5' into PHP-5.5.29
2015-09-01T18:43:27+00:00

Stanislav Malyshev
stas@php.net

2015-09-01T18:43:27+00:00

53d274beb0fc5716ccc41236ae6eb30c54d5eda5

* PHP-5.5:
  Improve fix for #70172
  Add CVE IDs asigned (post release) to PHP 5.4.43
  Add CVE IDs asigned to #69085 (PHP 5.4.39)

Conflicts:
	ext/pcre/php_pcre.c





* PHP-5.5:
  Improve fix for #70172
  Add CVE IDs asigned (post release) to PHP 5.4.43
  Add CVE IDs asigned to #69085 (PHP 5.4.39)

Conflicts:
	ext/pcre/php_pcre.c