Merge branch 'PHP-5.5' into PHP-5.6 · terrafrost/php-src@3a660bf · GitHub

Commit

Merge branch 'PHP-5.5' into PHP-5.6

Browse files

* PHP-5.5:
  Fixed bug 64343

; Lesson learned: do not rebase on a merge commit

Loading branch information

m6w6 committed Mar 30, 2015

2 parents ef52e44 + f4264eb commit 3a660bf