Merge branch 'PHP-5.4'

smalyshev · smalyshev · commit 05f4e3e52a3d · 2012-07-14T22:08:27.000-07:00
* PHP-5.4:
  Typofix in test-description
diff --git a/ext/standard/tests/zend_logo_guid.phpt b/ext/standard/tests/zend_logo_guid.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Checking the zend_logo_guid() functio
+Checking the zend_logo_guid() function
 --CREDITS--
 Sebastian Schürmann
 sschuermann@chip.de
