From 338e7b866f50ceec26853d7ea5033ba906450a9b Mon Sep 17 00:00:00 2001
From: Garvin Hicking <mail@garv.in>
Date: Mon, 10 May 2010 10:31:28 +0000
Subject: [PATCH] bump

---
 htmlarea/plugins/ExtendedFileManager/demo_images/.htaccess | 5 +++++
 serendipity_config.inc.php                                 | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/htmlarea/plugins/ExtendedFileManager/demo_images/.htaccess b/htmlarea/plugins/ExtendedFileManager/demo_images/.htaccess
index dee49831..107f050b 100755
--- a/htmlarea/plugins/ExtendedFileManager/demo_images/.htaccess
+++ b/htmlarea/plugins/ExtendedFileManager/demo_images/.htaccess
@@ -1,3 +1,8 @@
+<IfModule mod_php.c>
+php_flag engine off
+AddType text/html .html .htm .shtml .php .php3 .phtml .phtm .pl .py .cgi
+</IfModule>
+  
 <IfModule mod_php5.c>
 php_flag engine off
 AddType text/html .html .htm .shtml .php .php3 .phtml .phtm .pl .py .cgi
diff --git a/serendipity_config.inc.php b/serendipity_config.inc.php
index e80a05ff..3c653098 100644
--- a/serendipity_config.inc.php
+++ b/serendipity_config.inc.php
@@ -45,7 +45,7 @@ if (defined('USE_MEMSNAP')) {
 }
 
 // The version string
-$serendipity['version']         = '1.6-alpha1';
+$serendipity['version']         = '1.6-alpha2';
 
 // Setting this to 'false' will enable debugging output. All alpa/beta/cvs snapshot versions will emit debug information by default. To increase the debug level (to enable Smarty debugging), set this flag to 'debug'.
 $serendipity['production']      = (preg_match('@\-(alpha|beta|cvs)@', $serendipity['version']) ? false : true);