From: Mark Otto <markdotto@gmail.com>
Date: Fri, 27 Jan 2012 21:43:28 +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~120
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=335a8686dad95bf8e3c1bd2b1785a20ba9cc10ff;p=thirdparty%2Fbootstrap.git

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

Conflicts:
	docs/assets/css/bootstrap.css
---

335a8686dad95bf8e3c1bd2b1785a20ba9cc10ff
diff --cc docs/assets/css/bootstrap.css
index 0783aa7ee4,db6df3a198..8cf855b8b0
--- a/docs/assets/css/bootstrap.css
+++ b/docs/assets/css/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: Fri Jan 27 13:38:50 PST 2012
 - * Date: Fri Jan 27 13:37:10 PST 2012
++ * Date: Fri Jan 27 13:43:19 PST 2012
   */
  article,
  aside,