From: Christopher Jones <sixd@php.net>
Date: Thu, 15 Aug 2013 04:33:35 +0000 (-0700)
Subject: Merge branch 'PHP-5.5'
X-Git-Tag: php-5.6.0alpha1~291
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=77dea7898b2b4f0d248948e40795f9a690eaa5d8;p=php

Merge branch 'PHP-5.5'

* PHP-5.5:
---

77dea7898b2b4f0d248948e40795f9a690eaa5d8