Merge branch 'master' into branch_2.4

README.txt

@@ -9,20 +9,6 @@
 _________________________________________________________________________
 
 
-Shimmie Alpha
-~~~~~~~~~~~~~
-If you're reading this on github and looking for the stable version, go
-to the top of the page -> switch branches -> pick a stable branch. To do
-similarly with a git clone, "git checkout -b my_2.X origin/branch_2.X"
-
-This code is for people who want to write extensions compatible with the
-next version of shimmie. You can run a production site with it if you're
-feeling brave, but it's not recommended.
-
-If there is a feature here, and not in the stable branch, that's probably
-because the feature doesn't work yet :P
-
-
 Requirements
 ~~~~~~~~~~~~
 MySQL 5.1+ (with experimental support for PostgreSQL 8+ and SQLite 3)

core/sys_config.inc.php

@@ -33,7 +33,7 @@ _d("SPEED_HAX", false);      // boolean  do some questionable things in the name
 _d("COMPILE_ELS", false);    // boolean  pre-build the list of event listeners
 _d("NICE_URLS", false);      // boolean  force niceurl mode
 _d("WH_SPLITS", 1);          // int      how many levels of subfolders to put in the warehouse
-_d("VERSION", 'trunk');      // string   shimmie version
+_d("VERSION", '2.4.0');      // string   shimmie version
 _d("TIMEZONE", null);        // string   timezone
 _d("CORE_EXTS", "bbcode,user,mail,upload,image,view,handle_pixel,ext_manager,setup,upgrade,handle_404,comment,tag_list,index,tag_edit,alias_editor"); // extensions to always enable
 _d("EXTRA_EXTS", "");        // optional extra extensions