From: Jacob Thornton <jacobthornton@gmail.com>
Date: Sat, 3 Sep 2011 04:06:49 +0000 (-0700)
Subject: Merge branch 'js-examples' into 1.3-wip
X-Git-Tag: v1.3.0~86^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3c9c85b1ed85ae633d4b94f421020b84d24d9a5c;p=thirdparty%2Fbootstrap.git

Merge branch 'js-examples' into 1.3-wip

Conflicts:
	bootstrap-1.2.0.css
---

3c9c85b1ed85ae633d4b94f421020b84d24d9a5c
diff --cc bootstrap-1.2.0.css
index 7a848a247c,da9e1f2272..6beafa28b1
--- a/bootstrap-1.2.0.css
+++ b/bootstrap-1.2.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  2 20:59:16 PDT 2011
 - * Date: Fri Sep  2 21:04:38 PDT 2011
++ * Date: Fri Sep  2 21:06:46 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).