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
..
stylesheets	Merge branch 'stable'	2011-07-10 17:36:15 -07:00
templates	creating an extension now responds to the -x parameter for setting syntax	2011-04-23 11:12:16 -04:00