From: Julien Pauli <jpauli@php.net>
Date: Thu, 7 Jan 2016 12:05:38 +0000 (+0100)
Subject: Merge branch 'PHP-5.5' into PHP-5.6
X-Git-Tag: php-7.0.3RC1~63^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=2d0215b063c4e26bc4d3eef67381e5f1bb8789c3;p=php

Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  5.5.32 now

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

2d0215b063c4e26bc4d3eef67381e5f1bb8789c3