From: Jacob Thornton <jacobthornton@gmail.com>
Date: Thu, 18 Oct 2012 05:27:00 +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~12
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=a2fc01444eda94963dce3ce845b9c76bfef363e5;p=thirdparty%2Fbootstrap.git

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

a2fc01444eda94963dce3ce845b9c76bfef363e5