Merge commit 'origin/1.0' into sgn-1.0
authorPenny Leach <penny@titania.local>
Fri, 29 Jun 2007 22:43:15 +0000 (10:43 +1200)
committerPenny Leach <penny@titania.local>
Fri, 29 Jun 2007 22:43:15 +0000 (10:43 +1200)
commit91d2916315077347bf13a2b958e68731f61b2c07
tree1adfeae5a58f619d84d4c7a10d1704b661b0f1df
parentd0e71e06ce6285dfaeed0c2328f2116fa5cd61fc
parentffdfbc29472448322d05d9316c8d728d4d326313
Merge commit 'origin/1.0' into sgn-1.0

Conflicts:

include/functions_permalinks.inc.php
include/functions_comments.inc.php
include/functions_installer.inc.php
include/functions_permalinks.inc.php
include/genpage.inc.php
index.php
lang/UTF-8/serendipity_lang_en.inc.php
rss.php
serendipity_config.inc.php