From: Mark Otto <markdotto@gmail.com>
Date: Fri, 27 Jan 2012 00:31:10 +0000 (-0800)
Subject: Merge branch '2.0-wip' of github.com:twitter/bootstrap into 2.0-wip
X-Git-Tag: v2.0.0~6^2~135^2~4
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=e7bc2063beb8ab1a36b5001d5847c6995b005a29;p=thirdparty%2Fbootstrap.git

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

Conflicts:
	bootstrap.css
---

e7bc2063beb8ab1a36b5001d5847c6995b005a29
diff --cc bootstrap.css
index cadc4d2438,b71432eb4b..086537f5fd
--- a/bootstrap.css
+++ b/bootstrap.css
@@@ -6,7 -6,7 +6,7 @@@
   * http://www.apache.org/licenses/LICENSE-2.0
   *
   * Designed and built with all the love in the world @twitter by @mdo and @fat.
-  * Date: Thu Jan 26 16:26:33 PST 2012
 - * Date: Thu Jan 26 15:50:30 PST 2012
++ * Date: Thu Jan 26 16:30:52 PST 2012
   */
  article,
  aside,