]> granicus.if.org Git - php/commitdiff
projects / php / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 3003793 84be568)
Merge branch 'PHP-5.4' into PHP-5.5
authorStanislav Malyshev <stas@php.net>
Mon, 1 Dec 2014 05:38:30 +0000 (21:38 -0800)
committerStanislav Malyshev <stas@php.net>
Mon, 1 Dec 2014 05:38:30 +0000 (21:38 -0800)
* PHP-5.4:
  update news

Conflicts:
ext/standard/crypt.c


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