From: Christopher Jones <sixd@php.net>
Date: Mon, 5 Aug 2013 21:25:43 +0000 (-0700)
Subject: Merge branch 'PHP-5.5'
X-Git-Tag: php-5.6.0alpha1~338
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=85cc3b324014c283366e7091fb45a85cc6fb74c8;p=php

Merge branch 'PHP-5.5'

* PHP-5.5:
  Merge branch 'PHP-5.5'
---

85cc3b324014c283366e7091fb45a85cc6fb74c8