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

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

c02003e6b8fcb6a22d2bf458a22f24277b3e0b45