Merge branch 'PHP-5.5' into PHP-5.6
authorMichael Wallner <mike@php.net>
Tue, 5 Aug 2014 13:48:12 +0000 (15:48 +0200)
committerMichael Wallner <mike@php.net>
Tue, 5 Aug 2014 13:48:12 +0000 (15:48 +0200)
commitb2157ca5404a76b61674229224b9fa8eb27a7611
tree75ef27ec18429a570a49afc231a6f509c5529030
parent3cc2d5df0d0eaa8a21d1c2eda4b4d721847c0269
parent442629f81d7189fb39d1eba0b45c1ca9d82ca463
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  BFN
  Fixed Bug #67724