Merge branch 'PHP-5.5' of git://github.com/php/php-src into PHP-5.5
- Fixed ZTS build
Merge branch 'PHP-5.5'

* PHP-5.5:
  - Fixed ZTS build