Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  Fixed bug 64343

; Lesson learned: do not rebase on a merge commit
This commit is contained in:
Michael Wallner 2015-03-30 13:48:57 +02:00
commit 3a660bf3a5

Diff Content Not Available