Fix for Bug #64394 MYSQL_OPT_CAN_HANDLE_EXPIRED_PASSWORDS undeclared when using Connector/C
Merge branch 'PHP-5.5'

Conflicts:
	NEWS
Merge branch 'master' of ssh://git.php.net/php-src