From: Julien Pauli <jpauli@php.net>
Date: Wed, 2 Sep 2015 15:42:00 +0000 (+0200)
Subject: Merge branch 'PHP-5.5' into PHP-5.6
X-Git-Tag: php-5.6.14RC1~22
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=c07150cd1a11d3bed7e88068869d515f91d980b5;p=php

Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  5.5.30 next

Conflicts:
	configure.in
	main/php_version.h
---

c07150cd1a11d3bed7e88068869d515f91d980b5