Merge branch 'master' into stable

fa1f8513 · Dmitriy Zaporozhets · 1c5cb538 · a6f58b9c · fa1f8513 · fa1f8513
Commit fa1f8513 authored Sep 24, 2012 by Dmitriy Zaporozhets
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 1 deletion

CHANGELOG CHANGELOG +3 -0

VERSION VERSION +1 -1

No files found.
--- a/CHANGELOG
+++ b/CHANGELOG
+v 2.9.1
+  - Fixed resque custom config init
 v 2.9.0
  - fixed inline notes bugs
  - refactored rspecs

--- a/VERSION
+++ b/VERSION
-2.9.0
+2.9.1