Merge branch '1.1.1-wip'

author Jacob Thornton <jacobthornton@gmail.com>

Fri, 26 Aug 2011 22:21:20 +0000 (15:21 -0700)

committer Jacob Thornton <jacobthornton@gmail.com>

Fri, 26 Aug 2011 22:21:20 +0000 (15:21 -0700)
author Jacob Thornton <jacobthornton@gmail.com>
Fri, 26 Aug 2011 22:21:20 +0000 (15:21 -0700)
committer Jacob Thornton <jacobthornton@gmail.com>
Fri, 26 Aug 2011 22:21:20 +0000 (15:21 -0700)
diff --cc docs/index.html
Simple merge
diff --cc examples/hero.html
Simple merge
diff --cc lib/patterns.less
Simple merge
diff --cc lib/scaffolding.less
Simple merge
author	Jacob Thornton <jacobthornton@gmail.com>
	Fri, 26 Aug 2011 22:21:20 +0000 (15:21 -0700)
committer	Jacob Thornton <jacobthornton@gmail.com>
	Fri, 26 Aug 2011 22:21:20 +0000 (15:21 -0700)
		1	2
docs/index.html	patch \|	diff1 \|	diff2 \|	blob \| history
examples/hero.html	patch \|	diff1 \|	diff2 \|	blob \| history
lib/patterns.less	patch \|	diff1 \|	diff2 \|	blob \| history
lib/scaffolding.less	patch \|	diff1 \|	diff2 \|	blob \| history