]> granicus.if.org Git - php/commit
Merge branch 'PHP-7.0' into PHP-7.1
authorAnatol Belski <ab@php.net>
Sat, 8 Oct 2016 17:28:21 +0000 (19:28 +0200)
committerAnatol Belski <ab@php.net>
Sat, 8 Oct 2016 17:28:21 +0000 (19:28 +0200)
commitc43a54e4fe88b61497667d63049af3e5c5b70a59
treee2ea46d44e9fc9afd4346331c1cc9f1d55cae55f
parentf8a6df4706d039451c25e6fbc53169020bb0fc9b
parent6f84ac721b2674dc056430c420c839f4d2fe5b74
Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  fix leak
ext/mcrypt/mcrypt.c