From: Jacob Thornton <jacobthornton@gmail.com>
Date: Mon, 12 Sep 2011 21:29:29 +0000 (-0700)
Subject: Merge branch '1.3-wip' of github.com:twitter/bootstrap into 1.3-wip
X-Git-Tag: v1.3.0~21^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4c5320b18fb24356553dc14e13db69883797d105;p=thirdparty%2Fbootstrap.git

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

Conflicts:
	bootstrap-1.3.0.css
---

4c5320b18fb24356553dc14e13db69883797d105
diff --cc bootstrap-1.3.0.css
index 1f163c2715,4a4e0dfaab..762b4a53b1
--- a/bootstrap-1.3.0.css
+++ b/bootstrap-1.3.0.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: Mon Sep 12 14:28:15 PDT 2011
 - * Date: Mon Sep 12 13:32:28 PDT 2011
++ * Date: Mon Sep 12 14:29:06 PDT 2011
   */
  /* 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).