From: Mark Otto <mark.otto@twitter.com>
Date: Sat, 22 Oct 2011 22:51:24 +0000 (-0700)
Subject: Merge branch '2.0-wip' of github.com:twitter/bootstrap into 2.0-wip
X-Git-Tag: v2.0.0~6^2~456
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fb7fbdb278cc76c597acb69de5cd3a5d6eb77b00;p=thirdparty%2Fbootstrap.git

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

Conflicts:
	bootstrap.css
	lib/responsive.less
---

fb7fbdb278cc76c597acb69de5cd3a5d6eb77b00
diff --cc bootstrap.css
index 256ab096bb,7eef72feef..aebabeecca
--- a/bootstrap.css
+++ b/bootstrap.css
@@@ -6,7 -6,7 +6,11 @@@
   * http://www.apache.org/licenses/LICENSE-2.0
   *
   * Designed and built with all the love in the world @twitter by @mdo and @fat.
++<<<<<<< HEAD
 + * Date: Sat Oct 22 15:49:12 PDT 2011
++=======
+  * Date: Fri Oct 21 11:54:44 CDT 2011
++>>>>>>> 2e09ffe3832106fab60dc01cc3159c13029bdf68
   */
  /* Reset.less
   * Props to Eric Meyer (meyerweb.com) for his CSS reset file. We're using an adapted version here that cuts out some of the reset HTML elements we will never need here (i.e., dfn, samp, etc).