]> granicus.if.org Git - php/commitdiff
projects / php / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 9d75b9f 8b6b39f)
Merge branch 'PHP-5.4' into PHP-5.5
authorFerenc Kovacs <tyra3l@gmail.com>
Wed, 6 Nov 2013 09:46:34 +0000 (10:46 +0100)
committerFerenc Kovacs <tyra3l@gmail.com>
Wed, 6 Nov 2013 09:46:34 +0000 (10:46 +0100)
Conflicts:
ext/spl/tests/SplFileObject_rewind_error001.phpt


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