From: Christopher Jones <sixd@php.net>
Date: Thu, 15 Aug 2013 04:32:13 +0000 (-0700)
Subject: Merge branch 'PHP-5.5' of https://git.php.net/repository/php-src into PHP-5.5
X-Git-Tag: php-5.5.2~3
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=5a186a3e0ad66dd5a921def7d45340b979d15293;p=php

Merge branch 'PHP-5.5' of https://git.php.net/repository/php-src into PHP-5.5

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

5a186a3e0ad66dd5a921def7d45340b979d15293