Fix typo in error message
Merge branch 'PHP-5.4' into PHP-5.5
Merge branch 'PHP-5.5'
fix enchant compilation under vc11
Merge branch 'PHP-5.5'

* PHP-5.5:
  fix enchant compilation under vc11