From: Nikita Popov <nikic@php.net>
Date: Thu, 12 Sep 2013 13:23:11 +0000 (+0200)
Subject: Merge branch 'PHP-5.5'
X-Git-Tag: PRE_PHPNG_MERGE~222^2~6^2~14
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=89d115264cbc24bcb30567781001793ac6c58a7f;p=php

Merge branch 'PHP-5.5'
---

89d115264cbc24bcb30567781001793ac6c58a7f