From: Jacob Thornton <jacobthornton@gmail.com>
Date: Wed, 16 Nov 2011 08:28:20 +0000 (-0800)
Subject: Merge branch 'master' of https://github.com/twitter/bootstrap
X-Git-Tag: v2.0.0~20
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=90f8eb6c144bbd409f196a0b33ec4ae2b47e1eb5;p=thirdparty%2Fbootstrap.git

Merge branch 'master' of https://github.com/twitter/bootstrap

Conflicts:
	bootstrap.css
---

90f8eb6c144bbd409f196a0b33ec4ae2b47e1eb5
diff --cc bootstrap.css
index 91216cc32d,75780fccc1..e9f2a38228
--- a/bootstrap.css
+++ b/bootstrap.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: Sat Nov 12 20:22:29 PST 2011
 - * Date: Sat Nov 12 01:04:51 PST 2011
++ * Date: Wed Nov 16 00:28:10 PST 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).