Merge branch 'PHP-5.4'

16 files changed, 0 insertions, 0 deletions

diff --git a/ext/spl/php_spl.c b/ext/spl/php_spl.c
index cd0086626f..cd0086626f 100755..100644
--- a/ext/spl/php_spl.c
+++ b/ext/spl/php_spl.c
diff --git a/ext/spl/php_spl.h b/ext/spl/php_spl.h
index 855a78c404..855a78c404 100755..100644
--- a/ext/spl/php_spl.h
+++ b/ext/spl/php_spl.h
diff --git a/ext/spl/spl_array.c b/ext/spl/spl_array.c
index 3c6b41edbc..3c6b41edbc 100755..100644
--- a/ext/spl/spl_array.c
+++ b/ext/spl/spl_array.c
diff --git a/ext/spl/spl_array.h b/ext/spl/spl_array.h
index 909f4c97dc..909f4c97dc 100755..100644
--- a/ext/spl/spl_array.h
+++ b/ext/spl/spl_array.h
diff --git a/ext/spl/spl_directory.c b/ext/spl/spl_directory.c
index b86e68659d..b86e68659d 100755..100644
--- a/ext/spl/spl_directory.c
+++ b/ext/spl/spl_directory.c
diff --git a/ext/spl/spl_directory.h b/ext/spl/spl_directory.h
index 96f5dd6cb7..96f5dd6cb7 100755..100644
--- a/ext/spl/spl_directory.h
+++ b/ext/spl/spl_directory.h
diff --git a/ext/spl/spl_engine.c b/ext/spl/spl_engine.c
index d501f31435..d501f31435 100755..100644
--- a/ext/spl/spl_engine.c
+++ b/ext/spl/spl_engine.c
diff --git a/ext/spl/spl_engine.h b/ext/spl/spl_engine.h
index db7affef80..db7affef80 100755..100644
--- a/ext/spl/spl_engine.h
+++ b/ext/spl/spl_engine.h
diff --git a/ext/spl/spl_exceptions.c b/ext/spl/spl_exceptions.c
index 570299a2a8..570299a2a8 100755..100644
--- a/ext/spl/spl_exceptions.c
+++ b/ext/spl/spl_exceptions.c
diff --git a/ext/spl/spl_exceptions.h b/ext/spl/spl_exceptions.h
index 8d3a58a30c..8d3a58a30c 100755..100644
--- a/ext/spl/spl_exceptions.h
+++ b/ext/spl/spl_exceptions.h
diff --git a/ext/spl/spl_functions.c b/ext/spl/spl_functions.c
index b9fd5dc8b9..b9fd5dc8b9 100755..100644
--- a/ext/spl/spl_functions.c
+++ b/ext/spl/spl_functions.c
diff --git a/ext/spl/spl_functions.h b/ext/spl/spl_functions.h
index 394de6ae9d..394de6ae9d 100755..100644
--- a/ext/spl/spl_functions.h
+++ b/ext/spl/spl_functions.h
diff --git a/ext/spl/spl_iterators.c b/ext/spl/spl_iterators.c
index 7b77cf5bb1..7b77cf5bb1 100755..100644
--- a/ext/spl/spl_iterators.c
+++ b/ext/spl/spl_iterators.c
diff --git a/ext/spl/spl_iterators.h b/ext/spl/spl_iterators.h
index 4a2c999c30..4a2c999c30 100755..100644
--- a/ext/spl/spl_iterators.h
+++ b/ext/spl/spl_iterators.h
diff --git a/ext/spl/spl_observer.c b/ext/spl/spl_observer.c
index 4b8be82eee..4b8be82eee 100755..100644
--- a/ext/spl/spl_observer.c
+++ b/ext/spl/spl_observer.c
diff --git a/ext/spl/spl_observer.h b/ext/spl/spl_observer.h
index bfee74f300..bfee74f300 100755..100644
--- a/ext/spl/spl_observer.h
+++ b/ext/spl/spl_observer.h