]> granicus.if.org Git - php/commitdiff
projects / php / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: f23a5fb 2c73ce4)
Merge branch 'PHP-5.4' into PHP-5.5
authorStanislav Malyshev <stas@php.net>
Mon, 15 Jul 2013 07:27:57 +0000 (00:27 -0700)
committerStanislav Malyshev <stas@php.net>
Mon, 15 Jul 2013 07:27:57 +0000 (00:27 -0700)
* PHP-5.4:
  revert false fix
  typo fixes
  less serious compatAbility fixes
  typos (orig)

Conflicts:
ext/mysql/php_mysql.c


Trivial merge
Unnamed repository; edit this file 'description' to name the repository.