]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.6' of git.php.net:php-src into PHP-5.6
authorDmitry Stogov <dmitry@zend.com>
Mon, 16 Dec 2013 09:13:18 +0000 (13:13 +0400)
committerDmitry Stogov <dmitry@zend.com>
Mon, 16 Dec 2013 09:13:18 +0000 (13:13 +0400)
* 'PHP-5.6' of git.php.net:php-src:
  Fix tests expecting specific resource IDs
  fixed parameter order for zend_throw_exception_ex call
  Fix doc (svn -> git)
  Test pushing
  Updated release process


Trivial merge