]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.4' into PHP-5.5
authorAnatol Belski <ab@php.net>
Thu, 6 Jun 2013 16:52:39 +0000 (18:52 +0200)
committerAnatol Belski <ab@php.net>
Thu, 6 Jun 2013 16:52:39 +0000 (18:52 +0200)
* PHP-5.4:
  updated NEWS
  Fixed bug #64934 Apache2 TS crash with get_browser()


Trivial merge