Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5
authorDmitry Stogov <dmitry@zend.com>
Mon, 16 Dec 2013 09:13:29 +0000 (13:13 +0400)
committerDmitry Stogov <dmitry@zend.com>
Mon, 16 Dec 2013 09:13:29 +0000 (13:13 +0400)
commita67c615799fa227963117d3327713be205a37490
tree4e32934aa03c15bb1451a0b0ef9a38fe7dae0eeb
parente6dbf0eeffd5cdd2c8d5eca3ad27a8413fcaba75
parent7cf6f012b1590e68f95932bbc1ba7ec5de21a968
Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5

* 'PHP-5.5' 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)
  Updated release process