From: Mark Otto <mark.otto@twitter.com>
Date: Tue, 1 Nov 2011 06:28:05 +0000 (-0700)
Subject: Merge branch 'kriansa-patch1' into dev
X-Git-Tag: v1.4.0~7
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=5c86074fa9e5c8f39fa9ad4f4b8f028a8d5aebe6;p=thirdparty%2Fbootstrap.git

Merge branch 'kriansa-patch1' into dev

Conflicts:
	bootstrap.css
---

5c86074fa9e5c8f39fa9ad4f4b8f028a8d5aebe6
diff --cc bootstrap.css
index 9c88ab0464,09170c4624..1d4627ceb1
--- 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: Mon Oct 31 23:21:58 PDT 2011
 - * Date: Mon Oct 31 23:26:38 PDT 2011
++ * Date: Mon Oct 31 23:27:57 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).