Merge branch 'stable'

Conflicts: VERSION doc-src/SASS_CHANGELOG.md
sass · Apr 21, 2012 · cc58837 · cc58837
2 parents 05235ac + 425a472
commit cc58837
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/doc-src/SASS_CHANGELOG.md b/doc-src/SASS_CHANGELOG.md
@@ -139,7 +139,7 @@ that make use of `@media` and other directives dynamically.
 * `#{}` interpolation is now disallowed in all `@import` statements
   except for those using `url()`.
 
-## 3.1.16 (Unreleased)
+## 3.1.16
 
 * Fix some bugs in `sass-convert` selector parsing when converting from CSS.
 * Substantially improve compilation performance on Ruby 1.8.