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

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

Conflicts:
	bootstrap-1.3.0.css
---

79d5f907130a030963b802647e3ed3bcb6300a46
diff --cc bootstrap-1.3.0.css
index fd1a173c65,e8024e443a..f42e314a2e
--- 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: Fri Sep  9 20:23:37 PDT 2011
 - * Date: Fri Sep  9 21:42:21 PDT 2011
++ * Date: Fri Sep  9 22:48:53 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).