From: fat <jacobthornton@gmail.com>
Date: Tue, 30 Oct 2012 04:28:17 +0000 (-0700)
Subject: Merge branch '2.1.2-wip' of github.com:twitter/bootstrap into 2.1.2-wip
X-Git-Tag: v2.2.0^2~3
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=31c1eba51bf3f5a988e7bef9da88372e673c30c2;p=thirdparty%2Fbootstrap.git

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

Conflicts:
	bootstrap/css/bootstrap.css
	bootstrap/css/bootstrap.min.css
---

31c1eba51bf3f5a988e7bef9da88372e673c30c2