]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.4' into PHP-5.5
authorStanislav Malyshev <stas@php.net>
Mon, 7 Jul 2014 08:36:03 +0000 (01:36 -0700)
committerStanislav Malyshev <stas@php.net>
Mon, 7 Jul 2014 08:36:03 +0000 (01:36 -0700)
commitc4029561782234abb0b8b463f546f794ad03f1cc
treeca810306d9fe6ab7f3ffeea9a84d66ea7837aadc
parent96c9cc315d8dea5b0d2c8b855620e3723d149470
parenta7d1cad4c308253b1bc2a79d94c750c31788c312
Merge branch 'PHP-5.4' into PHP-5.5

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