From: Christopher Jones <sixd@php.net>
Date: Mon, 29 Jul 2013 16:43:42 +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~38
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=e37fdbb2f230d11e375a755bddcebf36f338040b;p=php

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

# By Dmitry Stogov
# Via Dmitry Stogov
* 'PHP-5.5' of https://git.php.net/repository/php-src:
  Merge from GitHub
---

e37fdbb2f230d11e375a755bddcebf36f338040b