From: Julien Pauli <jpauli@php.net>
Date: Wed, 22 Jul 2015 07:28:59 +0000 (+0200)
Subject: Merge branch 'PHP-5.6'
X-Git-Tag: php-7.0.0beta3~5^2~111
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=c274e2397d27e5fb7d212b7b68b85a2bf82ceb3a;p=php

Merge branch 'PHP-5.6'

* PHP-5.6:
  5.6.13 now

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

c274e2397d27e5fb7d212b7b68b85a2bf82ceb3a