From: Jacob Thornton <jacobthornton@gmail.com>
Date: Fri, 27 Jan 2012 21:37:14 +0000 (-0800)
Subject: Merge branch '2.0-wip' of https://github.com/twitter/bootstrap into 2.0-wip
X-Git-Tag: v2.0.0~6^2~120^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=3c7e3eb7d37507ba12d95024f06d6f872a44eecd;p=thirdparty%2Fbootstrap.git

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

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

3c7e3eb7d37507ba12d95024f06d6f872a44eecd
diff --cc docs/assets/css/bootstrap.css
index b365ad0f43,9c8aaee5a5..db6df3a198
--- 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:34:19 PST 2012
 - * Date: Fri Jan 27 13:35:54 PST 2012
++ * Date: Fri Jan 27 13:37:10 PST 2012
   */
  article,
  aside,