From: Jacob Thornton <jacobthornton@gmail.com>
Date: Sun, 8 Jan 2012 08:50:48 +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~329
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=bc505560a05cd867ea8dbfbcefe2217223d58316;p=thirdparty%2Fbootstrap.git

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

Conflicts:
	bootstrap.css
	bootstrap.min.css
---

bc505560a05cd867ea8dbfbcefe2217223d58316
diff --cc bootstrap.css
index 7d6263c6bd,2881afefde..a46f6ca85a
--- 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: Sat Jan  7 23:50:13 PST 2012
 - * Date: Sat Jan  7 23:30:30 PST 2012
++ * Date: Sun Jan  8 00:50:20 PST 2012
   */
  html, body {
    margin: 0;