From: Stanislav Malyshev <stas@php.net>
Date: Mon, 7 Jul 2014 17:42:13 +0000 (-0700)
Subject: Merge branch 'PHP-5.5' into PHP-5.6
X-Git-Tag: PRE_PHPNG_MERGE~115^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=41448bff7cd00623f7b43e9aff0a443e7731e93b;p=php

Merge branch 'PHP-5.5' into PHP-5.6

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

Conflicts:
	.travis.yml
---

41448bff7cd00623f7b43e9aff0a443e7731e93b
diff --cc .travis.yml
index 8de7ee852d,b2ed607cac..2125e8d3d6
--- a/.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