Merge branch 'PHP-5.6' of https://github.com/php/php-src into PHP-5.6
opcodes
opcodes
fix news
Fixed Issue #140: "opcache.enable_file_override" doesn't respect "opcache.revalidate_freq"
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  Fixed Issue #140: "opcache.enable_file_override" doesn't respect "opcache.revalidate_freq"
  opcodes
Merge branch 'PHP-5.6'

* PHP-5.6:
  Fixed Issue #140: "opcache.enable_file_override" doesn't respect "opcache.revalidate_freq"
  fix news
  opcodes
  opcodes

Conflicts:
	NEWS