From: Christopher Jones <sixd@php.net>
Date: Thu, 25 Jul 2013 17:57:47 +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.2RC1~11
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=8e79724c6fc4532ac31afc29713dd39867ee578f;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:
---

8e79724c6fc4532ac31afc29713dd39867ee578f