From: Stanislav Malyshev <stas@php.net>
Date: Mon, 17 Jun 2013 08:06:28 +0000 (-0700)
Subject: Merge branch 'PHP-5.4' into PHP-5.5
X-Git-Tag: php-5.5.0~13
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=d587efb7ee6df0d68bb91c3680194089c7d6cb62;p=php

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  Merge branch 'pull-request/320'
---

d587efb7ee6df0d68bb91c3680194089c7d6cb62