From: Mark Otto <markdotto@gmail.com>
Date: Wed, 25 Jan 2012 20:43:31 +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~172
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=1c66779857066e662ff50bc8d6f05987965c0817;p=thirdparty%2Fbootstrap.git

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

Conflicts:
	bootstrap.css
---

1c66779857066e662ff50bc8d6f05987965c0817
diff --cc bootstrap.css
index c53264a2d6,b9cd608ae4..931d0c0179
--- a/bootstrap.css
+++ b/bootstrap.css
@@@ -6,7 -6,7 +6,11 @@@
   * http://www.apache.org/licenses/LICENSE-2.0
   *
   * Designed and built with all the love in the world @twitter by @mdo and @fat.
++<<<<<<< HEAD
 + * Date: Wed Jan 25 12:03:47 PST 2012
++=======
+  * Date: Wed Jan 25 11:49:21 PST 2012
++>>>>>>> 04f84997c18f2f132c8173f728f72b6b7aef52d1
   */
  article,
  aside,