]> granicus.if.org Git - php/commitdiff
projects / php / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 2dfabd8 6da2a97)
Merge branch 'PHP-5.5' into PHP-5.6
authorStanislav Malyshev <stas@php.net>
Wed, 20 Aug 2014 21:44:33 +0000 (14:44 -0700)
committerStanislav Malyshev <stas@php.net>
Wed, 20 Aug 2014 21:44:33 +0000 (14:44 -0700)
* PHP-5.5:
  fix test


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