From: Stanislav Malyshev <stas@php.net>
Date: Mon, 9 Jun 2014 02:04:35 +0000 (-0700)
Subject: Merge branch 'PHP-5.4' into PHP-5.5
X-Git-Tag: php-5.5.14RC1~18
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=e07083c378662b593779f05724fe75f550a2619b;p=php

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  fix order
---

e07083c378662b593779f05724fe75f550a2619b