From: Ferenc Kovacs <tyrael@php.net>
Date: Thu, 2 Oct 2014 20:32:18 +0000 (+0200)
Subject: Merge branch 'PHP-5.5' into PHP-5.6
X-Git-Tag: php-5.6.4RC1~59^2~5
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=7a529790b2c1bf6f20affbe06914de32fcc94fb3;p=php

Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  we also have xz release tarballs since 5.5
  5.5.19 now

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

7a529790b2c1bf6f20affbe06914de32fcc94fb3