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)
commit3a660bf3a5a73c10e05eccfcdf26d978f585f0af
tree1f3980161063acf14bd270d50236229ed5a01b35
parentef52e44053df40fb79bf5c2514252550fce7f04e
parentf4264ebc6499b82f892cefb54c0e4a0e9642e1d9
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  Fixed bug 64343

; Lesson learned: do not rebase on a merge commit