From: Julien Pauli <jpauli@php.net>
Date: Wed, 29 Apr 2015 09:21:18 +0000 (+0200)
Subject: Merge branch 'PHP-5.5' into PHP-5.6
X-Git-Tag: php-5.6.9RC1~1
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=d004c1d5fff77451ff3c6e96cfd8a11dbd83eb0a;p=php

Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  5.5.26 now

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

d004c1d5fff77451ff3c6e96cfd8a11dbd83eb0a