From: Christopher Jones <sixd@php.net>
Date: Mon, 5 Aug 2013 23:10:06 +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~33
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=6184753fab4f9370e1cbd5550c2e3a16ae865c28;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:
  PHP 5.5.2 has already branched
  Doh. PHP 5.5 NEWS needs own commit.
---

6184753fab4f9370e1cbd5550c2e3a16ae865c28