Chris Eppstein ea1389c1c8 Merge branch 'stable' ... * stable: Bump versions for v0.10.1 release. Update the CHANGELOG for the v0.10.1 release. Fix a broken reference to the extensions tutorial. Closes GH-135. [Blueprint] Regression fix: automatically apply the reset if blueprint/reset is imported. Closes GH-132. Fix a failing test case. [Rails] When configuring the Sass::Plugin, don't overwrite existing template locations. Closes GH-136. [Command Line] Improved descriptions of the watch and init commands. [Rails] Improved the next steps to perform after installing compass so that it mentions registering the compass gem. [Rails] Fixed a reference to the old configuration file. Add a note to the changelog about uninstalling chriseppstein-compass Get rid of some dead code that was breaking Rails 3. Closes GH-137. Conflicts: VERSION.yml doc-src/content/CHANGELOG.markdown frameworks/_blueprint_deprecated_imports/stylesheets/blueprint/modules/_reset.sass		2010-05-15 00:26:20 -07:00
..
stylesheets	Merge branch 'stable'	2010-05-15 00:26:20 -07:00
templates	[Blueprint] Silence some deprecation warnings created by the template file.	2010-05-08 18:18:47 -07:00