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

Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  change locale - looks like not everybody has sl_SI
---

432bb7abe5effd0978b7c7e09e46630c1a6826d3