From: Mark Otto <markotto@twitter.com>
Date: Wed, 26 Sep 2012 23:02:33 +0000 (-0700)
Subject: Merge branch '2.1.2-wip' into box-sizing-exercise
X-Git-Tag: v3.0.0-rc1~929
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=ad96435d27de7661a158552ad088fd800fe66fe9;p=thirdparty%2Fbootstrap.git

Merge branch '2.1.2-wip' into box-sizing-exercise
---

ad96435d27de7661a158552ad088fd800fe66fe9