From: Stanislav Malyshev <stas@php.net>
Date: Mon, 15 Jul 2013 07:27:57 +0000 (-0700)
Subject: Merge branch 'PHP-5.4' into PHP-5.5
X-Git-Tag: php-5.5.1~20
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=0aadbf7578a89f1d8fcc1cc23d0751af9e6a739a;p=php

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  revert false fix
  typo fixes
  less serious compatAbility fixes
  typos (orig)

Conflicts:
	ext/mysql/php_mysql.c
---

0aadbf7578a89f1d8fcc1cc23d0751af9e6a739a