Merge branch '2.1.2-list-inline' of https://github.com/andriijas/bootstrap into andri...

author Mark Otto <otto@github.com>

Sun, 4 Nov 2012 20:27:30 +0000 (12:27 -0800)

committer Mark Otto <otto@github.com>

Sun, 4 Nov 2012 20:27:30 +0000 (12:27 -0800)
author Mark Otto <otto@github.com>
Sun, 4 Nov 2012 20:27:30 +0000 (12:27 -0800)
committer Mark Otto <otto@github.com>
Sun, 4 Nov 2012 20:27:30 +0000 (12:27 -0800)
diff --cc docs/assets/css/bootstrap.css
Simple merge
diff --cc docs/base-css.html
Simple merge
diff --cc docs/templates/pages/base-css.mustache
Simple merge
diff --cc less/type.less
Simple merge
author	Mark Otto <otto@github.com>
	Sun, 4 Nov 2012 20:27:30 +0000 (12:27 -0800)
committer	Mark Otto <otto@github.com>
	Sun, 4 Nov 2012 20:27:30 +0000 (12:27 -0800)
		1	2
docs/assets/css/bootstrap.css	patch \|	diff1 \|	diff2 \|	blob \| history
docs/base-css.html	patch \|	diff1 \|	diff2 \|	blob \| history
docs/templates/pages/base-css.mustache	patch \|	diff1 \|	diff2 \|	blob \| history
less/type.less	patch \|	diff1 \|	diff2 \|	blob \| history