From: Christopher Jones <sixd@php.net>
Date: Fri, 6 Sep 2013 18:05:08 +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.5RC1~11
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=e5678c9b95a68c28f40c43217e299eb22780a526;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:
---

e5678c9b95a68c28f40c43217e299eb22780a526