]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.6'
authorStanislav Malyshev <stas@php.net>
Mon, 7 Jul 2014 08:38:04 +0000 (01:38 -0700)
committerStanislav Malyshev <stas@php.net>
Mon, 7 Jul 2014 08:38:04 +0000 (01:38 -0700)
* PHP-5.6:
  change locale - looks like not everybody has sl_SI


Trivial merge