From: Mark Otto <markdotto@gmail.com>
Date: Fri, 27 Jan 2012 21:21:01 +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~124
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=ccd963e622bdcadc8a79f5b8c1bb770b09f63f20;p=thirdparty%2Fbootstrap.git

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

Conflicts:
	docs/assets/css/bootstrap.css
	docs/download.html
---

ccd963e622bdcadc8a79f5b8c1bb770b09f63f20
diff --cc docs/assets/css/bootstrap.css
index b772e8bbb5,b2284bc164..4f1e18ce99
--- a/docs/assets/css/bootstrap.css
+++ b/docs/assets/css/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: Fri Jan 27 13:19:35 PST 2012
 - * Date: Fri Jan 27 11:07:13 PST 2012
++ * Date: Fri Jan 27 13:20:51 PST 2012
   */
  article,
  aside,