Fixed ext/pdo_*/tests/pdo_005.phpt tests failure
Merge branch 'master' of git.php.net:php-src

* 'master' of git.php.net:php-src:
  fix directory separator in test
Merge remote-tracking branch 'php/master'
fix test
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  fix test
Merge branch 'PHP-5.6'

* PHP-5.6:
  fix test
fix test
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  fix test
Merge branch 'PHP-5.6'

* PHP-5.6:
  fix test
Merge branch 'master' of github.com:weltling/php-src
Fixed get_resources() prototype comments
Merge remote-tracking branch 'php/master'