From: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Date: Fri, 21 Jun 2013 09:27:23 +0000 (+0200)
Subject: Merge branch 'PHP-5.5'
X-Git-Tag: php-5.6.0alpha1~413
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=9b22faa5b8ea2579f6247e024b0c59fd032a7eed;p=php

Merge branch 'PHP-5.5'
---

9b22faa5b8ea2579f6247e024b0c59fd032a7eed