]> granicus.if.org Git - php/commitdiff
projects / php / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: aaf1971 6bf7c10)
Merge branch 'PHP-5.5' into PHP-5.6
authorStanislav Malyshev <stas@php.net>
Wed, 16 Apr 2014 00:17:39 +0000 (17:17 -0700)
committerStanislav Malyshev <stas@php.net>
Wed, 16 Apr 2014 00:17:39 +0000 (17:17 -0700)
* PHP-5.5:
  5.4.29 is next
  5.5.12RC1 setup

Conflicts:
configure.in
main/php_version.h


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