From: Dmitry Stogov <dmitry@zend.com>
Date: Tue, 21 Apr 2015 23:30:10 +0000 (+0300)
Subject: Merge branch 'master' of git.php.net:php-src
X-Git-Tag: PRE_PHP7_NSAPI_REMOVAL~187
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=c61bf4bc1120a92c7525b1bc1cd0ae3e1837b3c7;p=php

Merge branch 'master' of git.php.net:php-src

* 'master' of git.php.net:php-src:
  FAST_RET opcode also returns
  Also consider specific catches when checking for uncaught
  Break on uncaught exceptions in current frame in phpdbg
---

c61bf4bc1120a92c7525b1bc1cd0ae3e1837b3c7