Merge branch 'stable'

Conflicts:
	README
	doc/ranger.1
	ranger/__init__.py
	ranger/core/environment.py
	ranger/core/helper.py
	ranger/fsobject/fsobject.py

1 files changed, 23 insertions, 8 deletions

diff --git a/CHANGELOG b/CHANGELOG
index 8078305d..98f79991 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,12 +1,24 @@
-This log only documents changes between stable versions.
+NOTE: This log only documents changes between stable versions.
 
-From 1.2 on, odd minor version numbers (1.3, 1.5, 1.7,..) are assigned to the
-fresh git snapshots while stable versions will have even minor numbers.
+2010-12-13: Version 1.2.3
+* Enable binding to alt-keys
+* Fixed memory leak in garbage collecting of old, unused directory objects
+* Fixed python3 incompatibilities
+* Fixed problems with identifying changes of files
+* Fixed lazy lookup of some FSObject attributes
 
-1.2 -> 1.2.1:
+2010-10-10: Version 1.2.2
+* Prevent currently used directories from being garbage collected
+* Disable mouse buttons when console is open
+* Fixed :cd command: Without arguments, cd's into $HOME
+* Fixed bug which prevented pydoc to work on some config files
+* Fixed some bugs in "snow" and "jungle" colorschemes
+* Several other clean-ups and fixes
+
+2010-09-16: Version 1.2.1
 * Fixed yy/pp bug when yanking multiple directories
 
-1.1.2 -> 1.2:
+2010-09-13: Version 1.2.0
 * !!! Changed the default configuration directory to ~/.config/ranger !!!
 * Removed "Console Modes", each old mode is now a simple command
 * Disabled file previews by default if ranger is used by root
@@ -19,18 +31,21 @@ fresh git snapshots while stable versions will have even minor numbers.
 * Use the file ~/.mime.types for mime type detection
 * Several clean-ups and fixes
 
-1.1.1 -> 1.1.2:
+NOTE: From 1.2 on, odd minor version numbers (1.3, 1.5, 1.7,..) are assigned to
+the fresh git snapshots while stable versions will have even minor numbers.
+
+2010-07-17: Version 1.1.2
 * Fix crash when using scrollwheel to scroll down in some cases
 * The command "ranger dir1 dir2 ..." opens multiple directories in tabs
 * Removed pydoc html documentation by default, re-create it with "make doc"
 * Minor fixes
 
-1.1.0 -> 1.1.1:
+2010-06-18: Version 1.1.1
 * New install script, "setup.py"
 * New flag for running programs: "w" (waits for enter press)
 * Minor fixes
 
-1.0.4 -> 1.1.0:
+2010-06-09: Version 1.1.0
 * Added a man page
 * Tab support
 * Improved directory loading performance