From: Mark Otto <markdotto@gmail.com>
Date: Thu, 5 Jan 2012 09:37:06 +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~372
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=bdc22e71c8cbeddb1dbee9708ab68b4f23abb6f4;p=thirdparty%2Fbootstrap.git

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

Conflicts:
	bootstrap.css
---

bdc22e71c8cbeddb1dbee9708ab68b4f23abb6f4
diff --cc bootstrap.css
index ade32d9ba5,5413144e9d..f9f174c3d5
--- 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: Thu Jan  5 01:33:17 PST 2012
 - * Date: Mon Jan  2 22:33:44 PST 2012
++ * Date: Thu Jan  5 01:36:56 PST 2012
   */
  html, body {
    margin: 0;