]> granicus.if.org Git - php/commitdiff
Merge branch 'master' of git.php.net:php-src
authorDmitry Stogov <dmitry@zend.com>
Mon, 16 Dec 2013 09:12:55 +0000 (13:12 +0400)
committerDmitry Stogov <dmitry@zend.com>
Mon, 16 Dec 2013 09:12:55 +0000 (13:12 +0400)
* 'master' 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)
  Fix tests expecting specific resource IDs
  Test pushing
  Updated release process


Trivial merge