Merge commit 'origin/1.0' into sgn-1.0

Conflicts:

	include/functions_permalinks.inc.php

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

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

diff --cc include/functions_permalinks.inc.php
index cdb13704f47d327870d97ed2dfb0dfc199714ac4,324c3cdc9704cd350fa42a0a7dbcffbff3af1368..a431b9ba43b58a40d7ea92d90053e43b0235e363
--- 1/include/functions_permalinks.inc.php
--- 2/include/functions_permalinks.inc.php
+++ b/include/functions_permalinks.inc.php
@@@ -272,12 -258,9 +276,12 @@@ function serendipity_initPermalinks() 
   */
  function &serendipity_permalinkPatterns($return = false) {
      global $serendipity;
-     
+ 
      $PAT = array();
  
 +    $PAT['ABOUT']                    = '@/'  . $serendipity['permalinkAboutPath'];
 +    $PAT['BREAKFAST']                    = '@/'  . $serendipity['permalinkBreakfastPath'];
 +    $PAT['GALLERY']                  = '@/'  . $serendipity['permalinkGalleryPath'];
      $PAT['UNSUBSCRIBE']              = '@/'  . $serendipity['permalinkUnsubscribePath'].'/(.*)/([0-9]+)@';
      $PAT['APPROVE']                  = '@/'  . $serendipity['permalinkApprovePath'].'/(.*)/(.*)/([0-9]+)@';
      $PAT['DELETE']                   = '@/'  . $serendipity['permalinkDeletePath'].'/(.*)/(.*)/([0-9]+)@';

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

diff --cc index.php
Simple merge

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

diff --cc rss.php
Simple merge

diff --cc serendipity_config.inc.php
index 06f77e752279e676754118efe0ca792b799691e2,c34aa81fa1c2facb9f1b9590645c21deea9f8ed1..b377e4209af764cd6d356f94b9648a8b5bf66dec
--- 1/serendipity_config.inc.php
--- 2/serendipity_config.inc.php
+++ b/serendipity_config.inc.php
@@@ -12,9 -12,9 +12,9 @@@ if (!defined('S9Y_INCLUDE_PATH')) 
  define('S9Y_CONFIG_TEMPLATE',     S9Y_INCLUDE_PATH . 'include/tpl/config_local.inc.php');
  define('S9Y_CONFIG_USERTEMPLATE', S9Y_INCLUDE_PATH . 'include/tpl/config_personal.inc.php');
  
 -define('IS_installed', file_exists('serendipity_config_local.inc.php') && (filesize('serendipity_config_local.inc.php') > 0));
 +define('IS_installed', file_exists(dirname(__FILE__).'/serendipity_config_local.inc.php') && (filesize(dirname(__FILE__).'/serendipity_config_local.inc.php') > 0));
  
- if (IS_installed === true && !defined('IN_serendipity')) {
+ if (!defined('IN_serendipity')) {
      define('IN_serendipity', true);
  }