Merge branch 'master' into rails3

Conflicts: lib/thinking_sphinx/version.rb
amacneil · Nov 4, 2011 · a1c1d25 · a1c1d25
2 parents d090f64 + f14d31a
commit a1c1d25
Showing 1 changed file with 5 additions and 5 deletions.
diff --git a/HISTORY b/HISTORY
@@ -1,8 +1,3 @@
-Edge:
-* Updating Riddle references for impending 1.5.0 release.
-* Handle out-of-date indexed_models references.
-* Fixing STI model handling during context index loading (Kenn Ejima).
-
 2.0.9 - October 10th 2011
 * 1.4.9 changes (fixed invalid gemspec).
 
@@ -55,6 +50,11 @@ Edge:
 * Rails 3 support.
 * 1.4.0 changes.
 
+1.4.10 - November 4th 2011
+* Updating Riddle references for impending 1.5.0 release of Riddle.
+* Handle out-of-date indexed_models references.
+* Fixing STI model handling during context index loading (Kenn Ejima).
+
 1.4.9 - October 10th 2011
 * Fixing invalid gemspec.