From: Mark Otto <otto@github.com>
Date: Tue, 30 Oct 2012 04:30:45 +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^2~2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=a6968c4934f699c066b9e545b2f9c0c6da500fff;p=thirdparty%2Fbootstrap.git

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

a6968c4934f699c066b9e545b2f9c0c6da500fff