From: Mark Otto <markotto@twitter.com>
Date: Mon, 17 Sep 2012 22:28:41 +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~94
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=f69e244a6036a40fd1721b4e56dc54e5ce1f6af4;p=thirdparty%2Fbootstrap.git

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

f69e244a6036a40fd1721b4e56dc54e5ce1f6af4