reversed chomp alias addition as per Andi Gutmans' request

ext/standard/basic_functions.c

@@ -185,7 +185,6 @@ function_entry basic_functions[] = {
 	PHP_FE(parse_str,								second_arg_force_ref)
 	PHP_FE(str_pad,									NULL)
 	PHP_FALIAS(rtrim,			chop,				NULL)
-    PHP_FALIAS(chomp,           chop,               NULL)
 	PHP_FALIAS(strchr,			strstr,				NULL)
 	PHP_NAMED_FE(sprintf,		PHP_FN(user_sprintf),	NULL)
 	PHP_NAMED_FE(printf,		PHP_FN(user_printf),	NULL)

ext/standard/string.c

@@ -176,10 +176,6 @@ PHPAPI void php_trim(zval *str, zval * return_value, int mode)
    An alias for chop */
 /* }}} */
 
-/* {{{ proto string chomp(string str)
-   An alias for chop */
-/* }}} */
-
 /* {{{ proto string chop(string str)
    Remove trailing whitespace */
 PHP_FUNCTION(chop)