]> granicus.if.org Git - php/commitdiff
projects / php / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: e372e03 ea1c0c5)
Merge branch 'PHP-5.5' into PHP-5.6
authorMatteo Beccati <mbeccati@php.net>
Mon, 5 Jan 2015 11:11:46 +0000 (12:11 +0100)
committerMatteo Beccati <mbeccati@php.net>
Mon, 5 Jan 2015 11:11:46 +0000 (12:11 +0100)
* PHP-5.5:
  Update test after fixing bug #68371


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