Merge branch 'stable'

Conflicts: VERSION doc-src/SASS_CHANGELOG.md
twalpole · Mar 7, 2014 · 57333cc · 57333cc
2 parents 79d6711 + 85b821a
commit 57333cc
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/doc-src/SASS_CHANGELOG.md b/doc-src/SASS_CHANGELOG.md
@@ -425,7 +425,7 @@ of all directives, but will preserve any CSS rules.
 * `percentage()`, `round()`, `ceil()`, `floor()`, and `abs()` now
   take arguments named '$number' instead of '$value'.
 
-## 3.2.15 (Unreleased)
+## 3.2.15
 
 * Support `&.foo` when the parent selector has a newline followed by a comma.