Merge branch 'pull-request/132'

* pull-request/132:
  OK, bye bye JavaScript, let's just include credits before license
  Nicer (JSLint-compliant!) credits reveal JavaScript
  Removed now-unnecessary expose_php checks for logo
  Fixed small misalignment in prev commit
  Removed Logo GUIDs and replaced with Data URIs and div hidden with JS

diff --cc UPGRADING
index 7aea61f642f515c7eef8eb92c61fc6d207236c69,646419d7b8f2591501473a2bd1b22b3af17c6edb..4fac7a88f574157fb1644ea8db99815e000c6776
--- 1/UPGRADING
--- 2/UPGRADING
+++ b/UPGRADING
@@@ -21,8 -21,9 +21,11 @@@ PHP X.Y UPGRADE NOTE
  ========================================
  
  - Drop Windows XP and 2003 support. (Pierre)
 +- All internal case insensitivity handling for class, function and constant 
 +  names is done according to ASCII rules, current locale settings are ignored. 
+ - php_logo_guid(), php_egg_logo_guid(), php_real_logo_guid() and 
+   zend_logo_guid() have been removed
+ - Removal of Logo GUIDs
  
  ========================================
  2. New Features
@@@ -91,9 -92,8 +94,11 @@@
  - IntlDateFormatter::setTimeZoneID() and datefmt_set_timezone_id() are
    deprecated. Use IntlDateFormatter::setTimeZone() or datefmt_set_timezone()
    instead.
 +- IntlDateFormatter::format() and datefmt_format() now also accept an
 +  IntlCalendar object for formatting.
 +- Deprecated mcrypt_ecb() made to produce E_DEPRECATED.
+ - php_logo_guid(), php_egg_logo_guid(), php_real_logo_guid() and 
+   zend_logo_guid() have been removed
  
  ========================================
  5. New Functions

diff --cc ext/standard/basic_functions.c
Simple merge

diff --cc ext/standard/info.c
index 07e152874a354cb1858c92f406c7d958f4184567,11da06801260a4e30dbcca6c0b35ceee14651368..089f515d95b9beda9e3f6aea50b5d92f7e998b3b
--- 1/ext/standard/info.c
--- 2/ext/standard/info.c
+++ b/ext/standard/info.c
@@@ -893,6 -878,12 +878,12 @@@ PHPAPI void php_print_info(int flag TSR
                php_info_print_table_end();
        }
  
 -              php_print_credits(PHP_CREDITS_ALL, TSRMLS_C);
+ 
+       if ((flag & PHP_INFO_CREDITS) && !sapi_module.phpinfo_as_text) {        
+               php_info_print_hr();
++              php_print_credits(PHP_CREDITS_ALL TSRMLS_CC);
+       }
+ 
        if (flag & PHP_INFO_LICENSE) {
                if (!sapi_module.phpinfo_as_text) {
                        SECTION("PHP License");

diff --cc sapi/cli/php_cli_server.c
Simple merge