From: Bob Weinand <bobwei9@hotmail.com>
Date: Sun, 13 Apr 2014 17:27:43 +0000 (+0200)
Subject: Merge branch 'PHP-5.5' into PHP-5.6
X-Git-Tag: PRE_PHPNG_MERGE~397^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=fb99409f89c5a395a8e5c938f9ae6c941c301cc5;p=php

Merge branch 'PHP-5.5' into PHP-5.6
---

fb99409f89c5a395a8e5c938f9ae6c941c301cc5