From: Mark Otto <markdotto@gmail.com>
Date: Fri, 9 Dec 2011 19:33:02 +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~415
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=312ee6cdfb20f7602924c90e6ae37cba62a39da4;p=thirdparty%2Fbootstrap.git

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

Conflicts:
	bootstrap.css
---

312ee6cdfb20f7602924c90e6ae37cba62a39da4
diff --cc bootstrap.css
index d0c78d0370,afd87d1372..adae67ec91
--- 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: Fri Dec  9 11:23:25 PST 2011
 - * Date: Wed Nov 30 22:05:44 PST 2011
++ * Date: Fri Dec  9 11:32:45 PST 2011
   */
  html, body {
    margin: 0;