Chris Eppstein b8c0928f86 Merge branch 'stable' ... Conflicts: doc-src/content/CHANGELOG.markdown lib/compass/commands/watch_project.rb		2012-03-05 11:30:52 -08:00
..
compass	Merge branch 'stable'	2012-03-05 11:30:52 -08:00
compass.rb	Upgrade notifications for compass rails users to use the compass-rails gem.	2012-02-02 13:59:20 -08:00