]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.5' into PHP-5.6
authorRemi Collet <remi@php.net>
Thu, 5 Jun 2014 12:00:29 +0000 (14:00 +0200)
committerRemi Collet <remi@php.net>
Thu, 5 Jun 2014 12:00:29 +0000 (14:00 +0200)
* PHP-5.5:
  add test for previous fix


Trivial merge