From: Mark Otto <markdotto@gmail.com>
Date: Wed, 10 Oct 2012 17:29:55 +0000 (-0700)
Subject: Merge branch '2.1.2-wip' of https://github.com/twitter/bootstrap into 2.1.2-wip
X-Git-Tag: v2.2.0^2~26
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=df9a1c29f4ba246667e51f477e66f5f95f57dd8e;p=thirdparty%2Fbootstrap.git

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

df9a1c29f4ba246667e51f477e66f5f95f57dd8e