]> granicus.if.org Git - php/commitdiff
Merge branch 'master' of https://git.php.net/repository/php-src
authorChristopher Jones <sixd@php.net>
Mon, 2 Sep 2013 12:40:51 +0000 (05:40 -0700)
committerChristopher Jones <sixd@php.net>
Mon, 2 Sep 2013 12:40:51 +0000 (05:40 -0700)
* 'master' of https://git.php.net/repository/php-src:
  Typo....
  Add a XFAIL test for #64896
  Implement phase 1 of rfc/incompat_ctx
  Make use of direct returns in some places
  Always pass return_value_ptr to internal functions


Trivial merge