From: Nikita Popov <nikic@php.net>
Date: Thu, 28 Mar 2013 17:43:11 +0000 (+0100)
Subject: Merge branch 'PHP-5.4' into PHP-5.5
X-Git-Tag: php-5.6.0alpha1~448^2~62^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=15994a14a469d8b3e5588329f7c878bc64a7e2b3;p=php

Merge branch 'PHP-5.4' into PHP-5.5

Conflicts:
	.travis.yml
---

15994a14a469d8b3e5588329f7c878bc64a7e2b3