From: Stanislav Malyshev <stas@php.net>
Date: Mon, 9 Jun 2014 02:04:47 +0000 (-0700)
Subject: Merge branch 'PHP-5.5' into PHP-5.6
X-Git-Tag: PRE_PHPNG_MERGE~224^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=d2783fbf6c7db7e3c4bbfefc101dc5be818f8c33;p=php

Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  fix order
  fix order
---

d2783fbf6c7db7e3c4bbfefc101dc5be818f8c33