Merge branch 'PHP-5.5'
Fixed Bug #63738 unpack: back result with Z format

Fix result for empty string.
Same output as perl
perl -e 'print unpack("Z2","\0\0");' => ""
perl -e 'print unpack("Z2","A\0");'  => "A"
perl -e 'print unpack("Z2","AB\0");' => "AB"
perl -e 'print unpack("Z2","ABC\0");'=> "AB"
Merge branch 'PHP-5.5'

* PHP-5.5:
  Fixed Bug #63738 unpack: back result with Z format
Fixed license

Looks like a find and replace gone wrong.
Restored proper generators behaviour in conjunction with "finally". (Nikita)
Merge branch 'PHP-5.5'

* PHP-5.5:
  Restored proper generators behaviour in conjunction with "finally". (Nikita)
Really fix test pdo_mysql_class_constants.phpt

- with mysqlnd, constant always present
- with mysqli, check client library version
- without mysqlnd and without mysqli
	skip the test if no connection
	use connection to check client library

Note : MySQLPDOTest::getClientVersion() is broken with mysqlnd
as PDO::ATTR_CLIENT_VERSION return "mysqlnd 5.0.11-dev - 20120503..."
so, getClientVersion() return "11"
Merge branch 'PHP-5.5'

* PHP-5.5:
  Really fix test pdo_mysql_class_constants.phpt
An exception thrown in try or catch block is disacarded by return statement in finally block.
Merge branch 'PHP-5.5'

* PHP-5.5:
  An exception thrown in try or catch block is disacarded by return statement in finally block.
Merge branch 'master' of git.php.net:php-src

* 'master' of git.php.net:php-src:
  Really fix test pdo_mysql_class_constants.phpt
Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5

* 'PHP-5.5' of git.php.net:php-src:
  Really fix test pdo_mysql_class_constants.phpt
Merge branch 'license_fix' of https://github.com/leight/php-src
MFH
Merge branch 'PHP-5.3' into PHP-5.4
Merge branch 'PHP-5.4' into PHP-5.5
Merge branch 'PHP-5.5'
Fixed bug #63757 (getenv() produces memory leak with CGI SAPI)
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  Fixed bug #63757 (getenv() produces memory leak with CGI SAPI)

Conflicts:
	NEWS
Merge branch 'PHP-5.5'

* PHP-5.5:
  Fixed bug #63757 (getenv() produces memory leak with CGI SAPI)