Gustavo André dos Santos Lopes 8ee8ccda19 Merge branch '5.3' into 5.4 ... Conflicts: sapi/fpm/fpm/fpm_main.c		2012-05-23 13:27:21 +02:00
..
collator_attr.c	MFH:	2008-08-11 19:48:00 +00:00
collator_attr.h
collator_class.c	- Added missing PHP_FE_END/ZEND_FE_END	2011-08-06 01:22:27 +00:00
collator_class.h
collator_compare.c	Redid the fix for #60192 with suggestions by Pierre and Kalle	2011-11-03 16:20:11 +00:00
collator_compare.h
collator_convert.c	MFH:	2008-08-11 19:48:00 +00:00
collator_convert.h
collator_create.c	MFH:	2008-08-11 19:48:00 +00:00
collator_create.h
collator_error.c	MFH:	2008-08-11 19:48:00 +00:00
collator_error.h
collator_is_numeric.c
collator_is_numeric.h
collator_locale.c	Redid the fix for #60192 with suggestions by Pierre and Kalle	2011-11-03 16:20:11 +00:00
collator_locale.h
collator_sort.c	Fixed bug #62070	2012-05-23 13:25:32 +02:00
collator_sort.h	add collator_get_sort_key()	2009-10-26 22:35:48 +00:00
collator.c	MFH:	2008-08-11 19:48:00 +00:00
collator.h