Fixed merge conflicts

diff --git a/readme.txt b/readme.txt
index 1f10cb7..aa3e09f 100755 (executable)
--- a/readme.txt
+++ b/readme.txt
@@ -66,7 +66,8 @@ There is of course much more to this.
 (none)
 
 == Changelog ==
-= (pending) =
+= 2.10.46 =
+* Moved session startup from adminHooks.php to index.php to ensure there's always a session started.
 * Fixed member listings not using selected sort order setting past first page.
 * Smarty Templates updated to version 3.1.33 due to use of "each()" that is being depricated in PHP.