From: Stanislav Malyshev <stas@php.net>
Date: Tue, 14 Oct 2014 18:43:34 +0000 (-0700)
Subject: Merge branch 'PHP-5.5' into PHP-5.6
X-Git-Tag: php-5.6.3RC1~59^2~12
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=47a1447cc8b5be0b19843a21d533984803993755;p=php

Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  Fix return code (merges are hard :( )
---

47a1447cc8b5be0b19843a21d533984803993755