]> granicus.if.org Git - php/commitdiff
projects / php / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: ef52e44 f4264eb)
Merge branch 'PHP-5.5' into PHP-5.6
authorMichael Wallner <mike@php.net>
Mon, 30 Mar 2015 11:48:57 +0000 (13:48 +0200)
committerMichael Wallner <mike@php.net>
Mon, 30 Mar 2015 11:48:57 +0000 (13:48 +0200)
* PHP-5.5:
  Fixed bug 64343

; Lesson learned: do not rebase on a merge commit


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