Merge branch 'PHP-5.6' of git.php.net:php-src into PHP-5.6
brought the ext/sybase_ct/config.w32 up to date
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  brought the ext/sybase_ct/config.w32 up to date
Merge branch 'PHP-5.6'

* PHP-5.6:
  brought the ext/sybase_ct/config.w32 up to date
fix c89 compat
Merge branch 'PHP-5.6'

* PHP-5.6:
  fix c89 compat
Merge remote-tracking branch 'origin/master' into str_size_and_int64