]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.5'
authorAnatol Belski <ab@php.net>
Sun, 7 Apr 2013 20:20:57 +0000 (22:20 +0200)
committerAnatol Belski <ab@php.net>
Sun, 7 Apr 2013 20:20:57 +0000 (22:20 +0200)
* PHP-5.5:
  updated NEWS
  upgraded libmagic to 5.14
  leave a sane environment behind (even if empty) when exiting some OS atexit() handlers call getenv()


Trivial merge