]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.5' into PHP-5.6
authorAnatol Belski <ab@php.net>
Sat, 6 Dec 2014 11:00:17 +0000 (12:00 +0100)
committerAnatol Belski <ab@php.net>
Sat, 6 Dec 2014 11:00:17 +0000 (12:00 +0100)
* PHP-5.5:
  Fixed bug #65230 setting locale randomly broken

1  2 
main/snprintf.c

diff --cc main/snprintf.c
Simple merge