Merge commit '1.0' into sgn-1.0

diff --cc include/functions_comments.inc.php
Simple merge

diff --cc lang/UTF-8/serendipity_lang_en.inc.php
Simple merge

diff --cc lang/serendipity_lang_en.inc.php
Simple merge

diff --cc rss.php
Simple merge

diff --cc serendipity_config.inc.php
Simple merge