From: Mark Otto <markdotto@gmail.com>
Date: Mon, 26 Dec 2011 22:47:10 +0000 (-0600)
Subject: Merge branch '2.0-wip' of github.com:twitter/bootstrap into 2.0-wip
X-Git-Tag: v2.0.0~6^2~387
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=544120264d33945c1537b6621b29c71be3405d07;p=thirdparty%2Fbootstrap.git

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

Conflicts:
	bootstrap.css
---

544120264d33945c1537b6621b29c71be3405d07
diff --cc bootstrap.css
index 2ea7a8fbe3,333d6f04c0..5e22415ddd
--- 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 Dec 21 19:31:39 CST 2011
 - * Date: Sat Dec 24 22:30:43 PST 2011
++ * Date: Mon Dec 26 16:47:02 CST 2011
   */
  html, body {
    margin: 0;