From: Stanislav Malyshev <stas@php.net>
Date: Mon, 7 Jul 2014 08:36:03 +0000 (-0700)
Subject: Merge branch 'PHP-5.4' into PHP-5.5
X-Git-Tag: php-5.5.15RC1~11
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=c4029561782234abb0b8b463f546f794ad03f1cc;p=php

Merge branch 'PHP-5.4' into PHP-5.5

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

c4029561782234abb0b8b463f546f794ad03f1cc