]> granicus.if.org Git - php/commit
projects / php / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 5613178 fed80ee)
Merge branch 'PHP-5.5' into PHP-5.6
authorStanislav Malyshev <stas@php.net>
Mon, 27 Jan 2014 01:21:14 +0000 (17:21 -0800)
committerStanislav Malyshev <stas@php.net>
Mon, 27 Jan 2014 01:21:14 +0000 (17:21 -0800)
commit223a62d69eeace864cb5deb45e3a56eb3ac3beaa
tree36531bbdda12e31f7db99ec11c6f628ef85d37a4tree | snapshot
parent561317898c2c531bc9f91c8747cc0458b4c88e97commit | diff
parentfed80ee605df24c4fe70f09b77cb2551fdf47d79commit | diff
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  Fix English and improve by Stas. Thanks :)
  Update source docs
  Revert "Update source docs"
  Update source docs

Conflicts:
README.EXTENSIONS
CODING_STANDARDS diff1 | diff2 | blob | history
README.SUBMITTING_PATCH diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.