Add support for connect attributes, as of MySQL 5.6
Merge branch 'PHP-5.5' of ssh://git.php.net/php-src into PHP-5.5
Merge branch 'PHP-5.5'

Conflicts:
	NEWS
Revert "Update fputcsv() to escape all characters equally."

On second thoughts, while the behaviour _is_ broken, this isn't the right fix.

This reverts commit 9b5cb0e8059b1e8bec096067491ed8d75f878938.
Merge branch 'PHP-5.3' into PHP-5.4

* PHP-5.3:
  Revert "Update fputcsv() to escape all characters equally."
Revert "Apply the fputcsv test fix to SplFileObject_fputcsv.phpt. Mea culpa."

This reverts commit 0510701474e8d99b5b30139b5599e44f9b555a5a.
Merge branch 'master' of ssh://git.php.net/php-src

Conflicts:
	NEWS
Revert "Update fputcsv() to escape all characters equally."

On second thoughts, while the behaviour _is_ broken, this isn't the right fix.

This reverts commit 9b5cb0e8059b1e8bec096067491ed8d75f878938.
Revert "Apply the fputcsv test fix to SplFileObject_fputcsv.phpt. Mea culpa."

This reverts commit 0510701474e8d99b5b30139b5599e44f9b555a5a.
Revert "Update fputcsv() to escape all characters equally."

On second thoughts, while the behaviour _is_ broken, this isn't the right fix.

This reverts commit 9b5cb0e8059b1e8bec096067491ed8d75f878938.
Revert "Apply the fputcsv test fix to SplFileObject_fputcsv.phpt. Mea culpa."

This reverts commit 0510701474e8d99b5b30139b5599e44f9b555a5a.
Merge branch 'PHP-5.4' into PHP-5.5

Conflicts:
	NEWS
Merge branch 'PHP-5.5'
Merge branch 'PHP-5.5' of ssh://git.php.net/php-src into PHP-5.5
Merge branch 'master' of ssh://git.php.net/php-src
plug a leak - forgot ot use the dtor already written
Merge branch 'PHP-5.5'