Chris Eppstein 5ac72d5b0a Merge branch 'stable' ... * stable: Version Bump. Update changelog for 0.11.5 Reset only the block HTML elements #339 fix warning logic in vertical-rhythms module Conflicts: VERSION.yml		2011-07-10 17:36:15 -07:00
..
compass	Merge branch 'stable'	2011-07-10 17:36:15 -07:00
compass.rb	Include the Compass logger to prevent "uninitialized constant Compass::Logger"	2011-07-02 21:59:09 -07:00