From: Mark Otto <markdotto@gmail.com>
Date: Thu, 12 Jan 2012 05:59:33 +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~304
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=620d987f9f4a6e5d7bcf270159aea10e01d32a35;p=thirdparty%2Fbootstrap.git

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

Conflicts:
	bootstrap.css
---

620d987f9f4a6e5d7bcf270159aea10e01d32a35
diff --cc bootstrap.css
index 6ac110e296,817a1ead28..1250507b5e
--- 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: Wed Jan 11 09:43:04 PST 2012
 - * Date: Wed Jan 11 21:43:40 PST 2012
++ * Date: Wed Jan 11 21:59:22 PST 2012
   */
  html, body {
    margin: 0;