From: Christopher Jones <sixd@php.net>
Date: Thu, 15 Aug 2013 04:32:20 +0000 (-0700)
Subject: Merge branch 'master' of https://git.php.net/repository/php-src
X-Git-Tag: php-5.6.0alpha1~292
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=de0a602ce157120bccca9b1ae900855f01e53971;p=php

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

* 'master' of https://git.php.net/repository/php-src:
  Fixed #65431 in zend_exception.c by Sixd
---

de0a602ce157120bccca9b1ae900855f01e53971