From: Anatol Belski <ab@php.net>
Date: Tue, 2 Feb 2016 13:22:31 +0000 (+0100)
Subject: Merge branch 'PHP-5.5' into PHP-5.6
X-Git-Tag: php-7.0.4RC1~20^2~13
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=b837f205ca5f827dfef7561e728d82642d5449a0;p=php

Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  add error check to sysconf call
  Going for 5.5.33 now

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

b837f205ca5f827dfef7561e728d82642d5449a0