]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.5' into PHP-5.6
authorStanislav Malyshev <stas@php.net>
Mon, 9 Mar 2015 06:41:30 +0000 (23:41 -0700)
committerStanislav Malyshev <stas@php.net>
Mon, 9 Mar 2015 06:41:30 +0000 (23:41 -0700)
commit0f333fa93c63f70d06b5aa8c65b6bf23057b1b58
treeaf45efe997ff7e006a1f63765341a049f47a46f1
parent934d6ed900f3d9dbb94e8d428fd60cf2360d80d4
parentfa72f1ea869e23fd92c50f69a8350e50d57e1c12
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  added missing parentheses
  Fix #67626
  Fix #63486

Conflicts:
main/streams/userspace.c
main/streams/userspace.c