From: Mark Otto <markdotto@gmail.com>
Date: Wed, 25 Jan 2012 19:27:29 +0000 (-0800)
Subject: Merge branch '2.0-wip' of github.com:twitter/bootstrap into 2.0-wip
X-Git-Tag: v2.0.0~6^2~178
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=e24bd40b4a38b190caad2da9b90c683167c76004;p=thirdparty%2Fbootstrap.git

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

Conflicts:
	bootstrap.css
---

e24bd40b4a38b190caad2da9b90c683167c76004
diff --cc bootstrap.css
index 39add86960,e548f5afc6..730167f51f
--- 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: Wed Jan 25 11:24:56 PST 2012
 - * Date: Wed Jan 25 11:23:36 PST 2012
++ * Date: Wed Jan 25 11:27:15 PST 2012
   */
  article,
  aside,