Merge branch '2.1.2-wip' of github.com:twitter/bootstrap into 2.1.2-wip

author Jacob Thornton <jacobthornton@gmail.com>

Thu, 18 Oct 2012 06:06:58 +0000 (23:06 -0700)

committer Jacob Thornton <jacobthornton@gmail.com>

Thu, 18 Oct 2012 06:06:58 +0000 (23:06 -0700)
author Jacob Thornton <jacobthornton@gmail.com>
Thu, 18 Oct 2012 06:06:58 +0000 (23:06 -0700)
committer Jacob Thornton <jacobthornton@gmail.com>
Thu, 18 Oct 2012 06:06:58 +0000 (23:06 -0700)
diff --cc docs/assets/js/bootstrap-dropdown.js
Simple merge
diff --cc docs/assets/js/bootstrap.js
Simple merge
diff --cc js/bootstrap-dropdown.js
Simple merge
author	Jacob Thornton <jacobthornton@gmail.com>
	Thu, 18 Oct 2012 06:06:58 +0000 (23:06 -0700)
committer	Jacob Thornton <jacobthornton@gmail.com>
	Thu, 18 Oct 2012 06:06:58 +0000 (23:06 -0700)
		1	2
docs/assets/js/bootstrap-dropdown.js	patch \|	diff1 \|	diff2 \|	blob \| history
docs/assets/js/bootstrap.js	patch \|	diff1 \|	diff2 \|	blob \| history
js/bootstrap-dropdown.js	patch \|	diff1 \|	diff2 \|	blob \| history