Merge branch 'PHP-5.5' of ssh://git.php.net/php-src into PHP-5.5
support for password expiration in mysqlnd, through a flag
Merge branch 'PHP-5.5'
Use during connect the flags set with set_client_option()
Merge branch 'PHP-5.3' into PHP-5.4
Merge branch 'PHP-5.4' into PHP-5.5

Conflicts:
	ext/mysqlnd/mysqlnd.c
Merge branch 'PHP-5.5'
fix compilation error after merge
Merge branch 'PHP-5.4' into PHP-5.5

Conflicts:
	ext/mysqlnd/mysqlnd.c
Merge branch 'PHP-5.5'