Merge pull request #7809 from twitter/bs3_adding_btn_default

author Mark Otto <markdotto@gmail.com>

Wed, 8 May 2013 18:47:43 +0000 (11:47 -0700)

committer Mark Otto <markdotto@gmail.com>

Wed, 8 May 2013 18:47:43 +0000 (11:47 -0700)
author Mark Otto <markdotto@gmail.com>
Wed, 8 May 2013 18:47:43 +0000 (11:47 -0700)
committer Mark Otto <markdotto@gmail.com>
Wed, 8 May 2013 18:47:43 +0000 (11:47 -0700)
diff --cc docs/assets/css/bootstrap.css
Simple merge
diff --cc docs/docs.html
Simple merge
diff --cc less/variables.less
Simple merge
author	Mark Otto <markdotto@gmail.com>
	Wed, 8 May 2013 18:47:43 +0000 (11:47 -0700)
committer	Mark Otto <markdotto@gmail.com>
	Wed, 8 May 2013 18:47:43 +0000 (11:47 -0700)
		1	2
docs/assets/css/bootstrap.css	patch \|	diff1 \|	diff2 \|	blob \| history
docs/docs.html	patch \|	diff1 \|	diff2 \|	blob \| history
less/variables.less	patch \|	diff1 \|	diff2 \|	blob \| history