From: Mark Otto <mark.otto@twitter.com>
Date: Wed, 31 Aug 2011 23:27:28 +0000 (-0700)
Subject: merging in remote and recompiling
X-Git-Tag: v1.2.0~22^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0cb6804b6953d8fce53fcfae065288fd826d1941;p=thirdparty%2Fbootstrap.git

merging in remote and recompiling
---

0cb6804b6953d8fce53fcfae065288fd826d1941
diff --cc bootstrap-1.2.0.css
index 4b7da60032,98f1b20db3..b10c09558b
--- 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: Tue Aug 30 08:27:42 PDT 2011
 - * Date: Wed Aug 31 10:55:48 PDT 2011
++ * Date: Wed Aug 31 16:27:14 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).