]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-7.0' of git.php.net:/php-src into PHP-7.0
authorXinchen Hui <laruence@gmail.com>
Tue, 1 Mar 2016 11:20:57 +0000 (19:20 +0800)
committerXinchen Hui <laruence@gmail.com>
Tue, 1 Mar 2016 11:20:57 +0000 (19:20 +0800)
* 'PHP-7.0' of git.php.net:/php-src:
  remove unused vars
  fix possible pointer truncation on win64
  Updated NEWS
  extend check for add_flag
  LDAP - Added support to change the certificates verification


Trivial merge