]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.5'
authorArpad Ray <arraypad@gmail.com>
Wed, 17 Jul 2013 10:09:37 +0000 (11:09 +0100)
committerArpad Ray <arraypad@gmail.com>
Wed, 17 Jul 2013 10:09:37 +0000 (11:09 +0100)
* PHP-5.5:
  Fix bug #62129 - rfc1867 crashes php even though turned off


Trivial merge