Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  create locales and re-add test

Conflicts:
	.travis.yml

diff --cc .travis.yml
index 8de7ee852db15b069d3e9f84ba28e673987b5d75,b2ed607caced824fe0aa1ef2ca9beaf253d24889..2125e8d3d63f5b177563300dd1d80cd80787bdc7
--- 1/.travis.yml
--- 2/.travis.yml
+++ b/.travis.yml
@@@ -22,8 -25,9 +25,11 @@@ env
        - ENABLE_MAINTAINER_ZTS=1 ENABLE_DEBUG=1
  
  before_install:
 +    - sudo apt-get update -qq
 +    - sudo apt-get install -y libenchant-dev libaspell-dev libpspell-dev librecode-dev
+     - sudo cp ./travis/de /var/lib/locales/supported.d/de
+     - sudo dpkg-reconfigure locales
+ 
  before_script:
      # Compile PHP
      - ./travis/compile.sh