Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  Two tests deactivated until #63688 was fixed

tests/lang/034.phpt

@@ -4,6 +4,10 @@ Bug #12647 (Locale settings affecting float parsing)
 precision=14
 --SKIPIF--
 <?php  # try to activate a german locale
+if (substr(PHP_OS, 0, 3) == 'WIN') {
+    /* skip on windows until #63688 was fixed */
+    die('skip');
+}
 if (setlocale(LC_NUMERIC, "de_DE.UTF-8", "de_DE", "de", "german", "ge", "de_DE.ISO-8859-1") === FALSE) {
 	print "skip Can't find german locale";
 }

tests/lang/bug30638.phpt

@@ -2,6 +2,10 @@
 Bug #30638 (localeconv returns wrong LC_NUMERIC settings) (ok to fail on MacOS X)
 --SKIPIF--
 <?php  # try to activate a german locale
+if (substr(PHP_OS, 0, 3) == 'WIN') {
+    /* skip on windows until #63688 was fixed */
+    die('skip');
+}
 if (setlocale(LC_NUMERIC, "de_DE.UTF-8", "de_DE", "de", "german", "ge", "de_DE.ISO-8859-1") === FALSE) {
 	print "skip setlocale() failed";
 } elseif (strtolower(php_uname('s')) == 'darwin') {