Merge branch 'PHP-5.5' into PHP-5.6
authorRemi Collet <remi@php.net>
Wed, 20 Aug 2014 13:10:54 +0000 (15:10 +0200)
committerRemi Collet <remi@php.net>
Wed, 20 Aug 2014 13:10:54 +0000 (15:10 +0200)
* PHP-5.5:
  fixed variable corruption under win x64


Trivial merge