From: Xinchen Hui <laruence@php.net>
Date: Fri, 27 Dec 2013 06:06:35 +0000 (+0800)
Subject: Merge branch 'PHP-5.5' into PHP-5.6
X-Git-Tag: php-5.6.0alpha1~82
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=04a52443e7d7fa61f977f4af909e1b294523d321;p=php

Merge branch 'PHP-5.5' into PHP-5.6

Conflicts:
	main/php_version.h
---

04a52443e7d7fa61f977f4af909e1b294523d321