From: Jacob Thornton <jacobthornton@gmail.com>
Date: Thu, 12 Jan 2012 05:43:43 +0000 (-0800)
Subject: Merge branch '2.0-wip' of https://github.com/twitter/bootstrap into 2.0-wip
X-Git-Tag: v2.0.0~6^2~304^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=19090ea33322e9d4309497f838f8627ca21734bf;p=thirdparty%2Fbootstrap.git

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

Conflicts:
	bootstrap.css
---

19090ea33322e9d4309497f838f8627ca21734bf
diff --cc bootstrap.css
index 09b7b41821,561a705720..817a1ead28
--- 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 11 20:37:24 PST 2012
 - * Date: Tue Jan 10 21:52:26 PST 2012
++ * Date: Wed Jan 11 21:43:40 PST 2012
   */
  html, body {
    margin: 0;