cosmetics
Merge branch 'master' of ssh://git.php.net/php-src
plug recent leak
Allow setting SHA256 auth public key as option
read 1 instead of 2 bytes. The next 2 bytes are 2 and thus not a problem
Merge branch 'PHP-5.3' into PHP-5.4
Merge branch 'PHP-5.4'
Fixed bug #63241 PHP fails to open Windows deduplicated files.

Fix by (daniel dot stelter-gliese at innogames dot de).
No test is supplied because the issue addresses
the new feature of the Windows Server 2012 and
would need a very specific filesystem setup.
Merge branch 'PHP-5.3' into PHP-5.4

* PHP-5.3:
  Fixed bug #63241 PHP fails to open Windows deduplicated files.
Merge branch 'PHP-5.4'

* PHP-5.4:
  Fixed bug #63241 PHP fails to open Windows deduplicated files.

Conflicts:
	NEWS
Fixed bug #62444 (Handle leak in is_readable on windows).
Merge branch 'PHP-5.3' into PHP-5.4
Merge branch 'PHP-5.4'
The /e modifier is deprecated
Fixed bug #63428 (The behavior of execute() changed)
- Updated to version 2012.9 (2012i)
Merge branch 'PHP-5.3' into PHP-5.4
Merge branch 'PHP-5.4'
These need to be volatile in order to prevent leaking after the
longjmp in the error handler
These need to be volatile in order to prevent leaking after the
longjmp in the error handler