From: Stanislav Malyshev <stas@php.net>
Date: Mon, 22 Jul 2013 04:17:59 +0000 (-0700)
Subject: Merge branch 'PHP-5.5'
X-Git-Tag: php-5.6.0alpha1~377^2~1^2~6
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=1a05648e6ddb6af847a34e7adf4bbea45409809c;p=php

Merge branch 'PHP-5.5'

* PHP-5.5:
  next is 5.5.2
  add a few comment
  allow both the old and new cfg argument to work. (the old of course should contain the typo)
  mssql.compatability_mode fix

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

1a05648e6ddb6af847a34e7adf4bbea45409809c