]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.6'
authorAnatol Belski <ab@php.net>
Tue, 11 Aug 2015 14:54:27 +0000 (16:54 +0200)
committerAnatol Belski <ab@php.net>
Tue, 11 Aug 2015 14:54:27 +0000 (16:54 +0200)
* PHP-5.6:
  fix news entry
  updated NEWS
  fix bug #69833 mcrypt fd caching not working


Trivial merge